diff --git a/app/screens/login/form.tsx b/app/screens/login/form.tsx
index 921bfc95b..cfdfd487a 100644
--- a/app/screens/login/form.tsx
+++ b/app/screens/login/form.tsx
@@ -246,7 +246,7 @@ const LoginForm = ({config, extra, keyboardAwareRef, numberSSOs, serverDisplayNa
     const onLogin = useCallback(() => {
         Keyboard.dismiss();
         preSignIn();
-    }, [loginId, password]);
+    }, [loginId, password, theme]);
 
     const onLoginChange = useCallback((text) => {
         setLoginId(text);
@@ -326,7 +326,7 @@ const LoginForm = ({config, extra, keyboardAwareRef, numberSSOs, serverDisplayNa
                 />
             </Button>
         );
-    }, [buttonDisabled, isLoading, theme]);
+    }, [buttonDisabled, loginId, password, isLoading, theme]);
 
     return (
         <View style={styles.container}>
diff --git a/app/screens/server/form.tsx b/app/screens/server/form.tsx
index d3d49a1aa..e723b7d2f 100644
--- a/app/screens/server/form.tsx
+++ b/app/screens/server/form.tsx
@@ -121,7 +121,7 @@ const ServerForm = ({
     const onConnect = useCallback(() => {
         Keyboard.dismiss();
         handleConnect();
-    }, [buttonDisabled, connecting]);
+    }, [buttonDisabled, connecting, theme]);
 
     const onFocus = useCallback(() => {
         focus();