diff --git a/apps/trading-e2e/src/support/order-validation.ts b/apps/trading-e2e/src/support/order-validation.ts
index 294e7691f..60ae94786 100644
--- a/apps/trading-e2e/src/support/order-validation.ts
+++ b/apps/trading-e2e/src/support/order-validation.ts
@@ -32,9 +32,6 @@ export const testOrderAmendment = (
     ...expected,
   };
 
-  expectedOrder.expiresAt = expectedOrder.expiresAt || undefined;
-  expectedOrder.price = expectedOrder.price || undefined;
-
   const transaction: OrderAmendmentBody = {
     orderAmendment: expectedOrder,
   };
diff --git a/libs/wallet/src/context.ts b/libs/wallet/src/context.ts
index ebf4366c1..fec5f99c5 100644
--- a/libs/wallet/src/context.ts
+++ b/libs/wallet/src/context.ts
@@ -17,7 +17,7 @@ export interface VegaWalletContextShape {
   connect: (connector: VegaConnector) => Promise<PubKey[] | null>;
 
   /** Disconnects from the connector and clears public key state */
-  disconnect: () => Promise<boolean>;
+  disconnect: () => Promise<void>;
 
   /** Sets the current selected public key */
   selectPubKey: (pubKey: string) => void;
diff --git a/libs/wallet/src/provider.tsx b/libs/wallet/src/provider.tsx
index 517212562..9749fdb45 100644
--- a/libs/wallet/src/provider.tsx
+++ b/libs/wallet/src/provider.tsx
@@ -59,23 +59,19 @@ export const VegaWalletProvider = ({ children }: VegaWalletProviderProps) => {
   }, []);
 
   const disconnect = useCallback(async () => {
+    // always clear state after attempted disconnection.. this
+    // is because long lived token sessions (used in tests)
+    // cannot be cleared. Clearing state will force user to reconnect
+    // again as expected
+    setPubKeys(null);
+    setPubKey(null);
+    LocalStorage.removeItem(WALLET_KEY);
     try {
       await connector.current?.disconnect();
-      setPubKeys(null);
-      setPubKey(null);
       connector.current = null;
-      LocalStorage.removeItem(WALLET_KEY);
-      return true;
     } catch (err) {
       console.error(err);
-      if (err instanceof WalletError && err.code === 100) {
-        setPubKeys(null);
-        setPubKey(null);
-        connector.current = null;
-        LocalStorage.removeItem(WALLET_KEY);
-        return true;
-      }
-      return false;
+      connector.current = null;
     }
   }, []);