diff --git a/packages/keychain/src/components/DeploymentRequired.tsx b/packages/keychain/src/components/DeploymentRequired.tsx
index c274d0830..d09cf60be 100644
--- a/packages/keychain/src/components/DeploymentRequired.tsx
+++ b/packages/keychain/src/components/DeploymentRequired.tsx
@@ -45,7 +45,13 @@ export function DeploymentRequired({
         setDeployHash(hash);
       })
       .catch((e) => setError(e));
-  }, [account.chainId, account.username]);
+  }, [
+    account.chainId,
+    account.username,
+    hasPrefundRequest,
+    isDeployed,
+    deployRequest,
+  ]);
 
   if (isDeployed) {
     return <>{children}</>;
diff --git a/packages/keychain/src/components/Execute/index.tsx b/packages/keychain/src/components/Execute/index.tsx
index 9bbacf01b..dc1cf7f4f 100644
--- a/packages/keychain/src/components/Execute/index.tsx
+++ b/packages/keychain/src/components/Execute/index.tsx
@@ -128,7 +128,7 @@ export function Execute() {
       transaction_hash,
       code: ResponseCodes.SUCCESS,
     });
-  }, [account, calls, fees, ctx, origin, controller]);
+  }, [account, calls, ctx, origin, controller]);
 
   const policies = useMemo<Policy[]>(
     () =>
diff --git a/packages/keychain/src/components/Funding.tsx b/packages/keychain/src/components/Funding.tsx
index 06783d17a..056527f76 100644
--- a/packages/keychain/src/components/Funding.tsx
+++ b/packages/keychain/src/components/Funding.tsx
@@ -154,7 +154,7 @@ function FundingInner({ onComplete }: FundingInnerProps) {
 
       setError(e);
     }
-  }, [onComplete]);
+  }, [onComplete, deploySelf]);
 
   const onCopy = useCallback(() => {
     navigator.clipboard.writeText(controller.address);
diff --git a/packages/keychain/src/components/connect/CreateSession.tsx b/packages/keychain/src/components/connect/CreateSession.tsx
index f81b12216..3c7d2e036 100644
--- a/packages/keychain/src/components/connect/CreateSession.tsx
+++ b/packages/keychain/src/components/connect/CreateSession.tsx
@@ -26,9 +26,9 @@ export function CreateSession({
       await controller.approve(origin, expiresAt, policies, maxFees);
       onConnect(policies);
     } catch (e) {
-      setError(e)
-      setIsConnecting(false)
-    } 
+      setError(e);
+      setIsConnecting(false);
+    }
   }, [controller, origin, expiresAt, policies, maxFees, onConnect]);
 
   return (
@@ -52,13 +52,16 @@ export function CreateSession({
 
       <Footer hideTxSummary>
         {error && (
-          <ErrorAlert title="Create session failed" description={error.message} />
+          <ErrorAlert
+            title="Create session failed"
+            description={error.message}
+          />
         )}
         <Button
           colorScheme="colorful"
           isDisabled={isConnecting}
           isLoading={isConnecting}
-          onClick={()=> onCreateSession()}
+          onClick={() => onCreateSession()}
         >
           create session
         </Button>
diff --git a/packages/keychain/src/hooks/deploy.ts b/packages/keychain/src/hooks/deploy.ts
index 6a7b51548..98791ee5a 100644
--- a/packages/keychain/src/hooks/deploy.ts
+++ b/packages/keychain/src/hooks/deploy.ts
@@ -19,7 +19,7 @@ interface DeployInterface {
 }
 
 export const useDeploy = (): DeployInterface => {
-  const { chainId, prefunds, controller } = useConnection();
+  const { chainId, controller } = useConnection();
   const [isDeployed, setIsDeployed] = useState(false);
   const [isDeploying, setIsDeploying] = useState(false);
 
@@ -63,27 +63,30 @@ export const useDeploy = (): DeployInterface => {
         setIsDeploying(false);
       }
     },
-    [prefunds, chainId],
+    [chainId, isDeployed],
   );
 
-  const deploySelf = useCallback(async (maxFee: string) => {
-    if (isDeployed) return;
+  const deploySelf = useCallback(
+    async (maxFee: string) => {
+      if (isDeployed) return;
 
-    try {
-      setIsDeploying(true);
-      const { transaction_hash } =
-        await controller.account.cartridge.deploySelf(num.toHex(maxFee));
+      try {
+        setIsDeploying(true);
+        const { transaction_hash } =
+          await controller.account.cartridge.deploySelf(num.toHex(maxFee));
 
-      setIsDeployed(true);
-      return transaction_hash;
-    } catch (e) {
-      if (!e.message.includes("account already deployed")) {
-        throw e;
+        setIsDeployed(true);
+        return transaction_hash;
+      } catch (e) {
+        if (!e.message.includes("account already deployed")) {
+          throw e;
+        }
+      } finally {
+        setIsDeploying(false);
       }
-    } finally {
-      setIsDeploying(false);
-    }
-  }, []);
+    },
+    [controller.account, isDeployed],
+  );
 
   return {
     deployRequest,
diff --git a/packages/keychain/src/pages/slot/session/index.tsx b/packages/keychain/src/pages/slot/session/index.tsx
index 82a9fb19e..d79ec40c9 100644
--- a/packages/keychain/src/pages/slot/session/index.tsx
+++ b/packages/keychain/src/pages/slot/session/index.tsx
@@ -64,7 +64,7 @@ function CreateSession() {
           router.replace(`/slot/auth/failure`);
         });
     },
-    [router, queries.callback_uri],
+    [router, queries.callback_uri, controller.username, deployRequest],
   );
 
   // Handler when user clicks the Create button
@@ -117,12 +117,7 @@ function CreateSession() {
       })
       .catch((e) => console.error(e))
       .finally(() => setIsFetching(false));
-  }, [
-    rpcUrl,
-    chainId,
-    setController,
-    queries.username,
-  ]);
+  }, [rpcUrl, chainId, setController, queries.username]);
 
   // Once the controller is created upon start, check if a session already exists.
   // If yes, check if the policies of the session are the same as the ones that are
diff --git a/packages/ui-next/src/components/primitives/command.tsx b/packages/ui-next/src/components/primitives/command.tsx
index 6a658f09a..be146da90 100644
--- a/packages/ui-next/src/components/primitives/command.tsx
+++ b/packages/ui-next/src/components/primitives/command.tsx
@@ -23,7 +23,7 @@ const Command = React.forwardRef<
 ));
 Command.displayName = CommandPrimitive.displayName;
 
-interface CommandDialogProps extends DialogProps { }
+interface CommandDialogProps extends DialogProps {}
 
 const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
   return (
diff --git a/packages/ui-next/src/components/primitives/toggle-group.tsx b/packages/ui-next/src/components/primitives/toggle-group.tsx
index c448695a1..ac360df2a 100644
--- a/packages/ui-next/src/components/primitives/toggle-group.tsx
+++ b/packages/ui-next/src/components/primitives/toggle-group.tsx
@@ -17,7 +17,7 @@ const ToggleGroupContext = React.createContext<
 const ToggleGroup = React.forwardRef<
   React.ElementRef<typeof ToggleGroupPrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Root> &
-  VariantProps<typeof toggleVariants>
+    VariantProps<typeof toggleVariants>
 >(({ className, variant, size, children, ...props }, ref) => (
   <ToggleGroupPrimitive.Root
     ref={ref}
@@ -35,7 +35,7 @@ ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName;
 const ToggleGroupItem = React.forwardRef<
   React.ElementRef<typeof ToggleGroupPrimitive.Item>,
   React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Item> &
-  VariantProps<typeof toggleVariants>
+    VariantProps<typeof toggleVariants>
 >(({ className, children, variant, size, ...props }, ref) => {
   const context = React.useContext(ToggleGroupContext);
 
diff --git a/packages/ui-next/src/themes/dark.css b/packages/ui-next/src/themes/dark.css
index 9771282bb..aec05d9ff 100644
--- a/packages/ui-next/src/themes/dark.css
+++ b/packages/ui-next/src/themes/dark.css
@@ -1,34 +1,34 @@
 @layer base {
-    .dark {
-        --background: 135 8% 9%; /* bg */
-        --foreground: 0 0% 100%; /* text.primary */
+  .dark {
+    --background: 135 8% 9%; /* bg */
+    --foreground: 0 0% 100%; /* text.primary */
 
-        --card: 135 8% 9%; /* bg */
-        --card-foreground: 0 0% 100%; /* text.primary */
+    --card: 135 8% 9%; /* bg */
+    --card-foreground: 0 0% 100%; /* text.primary */
 
-        --popover: 135 8% 9%; /* bg */
-        --popover-foreground: 0 0% 100%; /* text.primary */
+    --popover: 135 8% 9%; /* bg */
+    --popover-foreground: 0 0% 100%; /* text.primary */
 
-        --primary: 44 96% 61%; /* brand.primary */
-        --primary-foreground: 135 8% 9%; /* bg */
+    --primary: 44 96% 61%; /* brand.primary */
+    --primary-foreground: 135 8% 9%; /* bg */
 
-        --secondary: 136 6% 13%; /* solid.primary */
-        --secondary-foreground: 0 0% 100%; /* text.primary */
+    --secondary: 136 6% 13%; /* solid.primary */
+    --secondary-foreground: 0 0% 100%; /* text.primary */
 
-        --tertiary: 120 57% 78%;
-        --tertiary-foreground: 0 0% 0%;
+    --tertiary: 120 57% 78%;
+    --tertiary-foreground: 0 0% 0%;
 
-        --muted: 132 4% 23%; /* solid.accent */
-        --muted-foreground: 0 0% 50%; /* text.secondary */
+    --muted: 132 4% 23%; /* solid.accent */
+    --muted-foreground: 0 0% 50%; /* text.secondary */
 
-        --accent: 132 4% 23%; /* solid.accent */
-        --accent-foreground: 210 40% 98%; /* text.secondaryAccent */
+    --accent: 132 4% 23%; /* solid.accent */
+    --accent-foreground: 210 40% 98%; /* text.secondaryAccent */
 
-        --destructive: 7 72% 65%; /* text.error */
-        --destructive-foreground: 7 72% 65%; /* text.error */
+    --destructive: 7 72% 65%; /* text.error */
+    --destructive-foreground: 7 72% 65%; /* text.error */
 
-        --border: 0 100% 100%; /* black */
-        --input: 0 100% 100%; /* black */
-        --ring: 0 0% 100%; /* text.primary */
-    }
+    --border: 0 100% 100%; /* black */
+    --input: 0 100% 100%; /* black */
+    --ring: 0 0% 100%; /* text.primary */
+  }
 }
diff --git a/packages/ui-next/src/themes/default.css b/packages/ui-next/src/themes/default.css
index 9f8e35715..5ce1819e7 100644
--- a/packages/ui-next/src/themes/default.css
+++ b/packages/ui-next/src/themes/default.css
@@ -1,36 +1,36 @@
 @layer base {
-    :root {
-        --background: 220 60% 99%;
-        --foreground: 0 0% 0%;
+  :root {
+    --background: 220 60% 99%;
+    --foreground: 0 0% 0%;
 
-        --card: 220 60% 99%;
-        --card-foreground: 0 0% 0%;
+    --card: 220 60% 99%;
+    --card-foreground: 0 0% 0%;
 
-        --popover: 220 60% 99%;
-        --popover-foreground: 0 0% 0%;
+    --popover: 220 60% 99%;
+    --popover-foreground: 0 0% 0%;
 
-        --primary: 255 73% 61%;
-        --primary-foreground: 220 60% 99%;
+    --primary: 255 73% 61%;
+    --primary-foreground: 220 60% 99%;
 
-        --secondary: 210 22% 96%;
-        --secondary-foreground: 0 0% 0%;
+    --secondary: 210 22% 96%;
+    --secondary-foreground: 0 0% 0%;
 
-        --tertiary: 255 73% 61%;
-        --tertiary-foreground: 220 60% 99%;
+    --tertiary: 255 73% 61%;
+    --tertiary-foreground: 220 60% 99%;
 
-        --muted: 207 15% 85%;
-        --muted-foreground: 0 0% 50%;
+    --muted: 207 15% 85%;
+    --muted-foreground: 0 0% 50%;
 
-        --accent: 207 15% 85%;
-        --accent-foreground: 222.2 47.4% 11.2%;
+    --accent: 207 15% 85%;
+    --accent-foreground: 222.2 47.4% 11.2%;
 
-        --destructive: 7 72% 65%;
-        --destructive-foreground: 7 72% 65%;
+    --destructive: 7 72% 65%;
+    --destructive-foreground: 7 72% 65%;
 
-        --border: 0 0% 0%;
-        --input: 0 0% 0%;
-        --ring: 0 0% 0%;
+    --border: 0 0% 0%;
+    --input: 0 0% 0%;
+    --ring: 0 0% 0%;
 
-        --radius: 0.5rem;
-    }
+    --radius: 0.5rem;
+  }
 }