diff --git a/src/Connect.svelte b/src/Connect.svelte
index 9f1960565..2a98a1a00 100644
--- a/src/Connect.svelte
+++ b/src/Connect.svelte
@@ -8,9 +8,7 @@
 
   let walletUnavailable = !window.ethereum;
 
-  const connecting = derived(session, ($s) => {
-    return $s.connection === Connection.Connecting;
-  });
+  $: connecting = $session.connection === Connection.Connecting;
 </script>
 
 <style>
@@ -20,10 +18,10 @@
   on:click={connectWallet}
   {style}
   class="connect {className}"
-  disabled={$connecting || walletUnavailable}
-  data-waiting={$connecting || null}
+  disabled={connecting || walletUnavailable}
+  data-waiting={connecting || null}
 >
-  {#if $connecting}
+  {#if connecting}
     Connecting...
   {:else}
     {caption}
diff --git a/src/Header.svelte b/src/Header.svelte
index 8d1d5b600..a52af82e9 100644
--- a/src/Header.svelte
+++ b/src/Header.svelte
@@ -13,8 +13,8 @@
   let sessionButton = null;
   let sessionButtonHover = false;
 
-  const address = derived(session, $s => { return $s.address });
-  const tokenBalance = derived(session, $s => { return $s.tokenBalance });
+  $: address = $session.address;
+  $: tokenBalance = $session.tokenBalance;
 </script>
 
 <style>
@@ -82,9 +82,9 @@
       <a use:link href="/vesting/">Vesting</a>
     </span>
 
-    {#if $address}
+    {#if address}
       <span class="balance">
-        {formatBalance($tokenBalance)} <strong>RAD</strong>
+        {formatBalance(tokenBalance)} <strong>RAD</strong>
       </span>
 
       <button class="address outline small" bind:this={sessionButton}
@@ -95,7 +95,7 @@
         {#if sessionButtonHover}
           Disconnect
         {:else}
-          {formatAddress($address)}
+          {formatAddress(address)}
         {/if}
       </button>
     {:else}