diff --git a/apps/web/pages/auth/login.tsx b/apps/web/pages/auth/login.tsx
index c6c32275d6..7eb97c71f3 100644
--- a/apps/web/pages/auth/login.tsx
+++ b/apps/web/pages/auth/login.tsx
@@ -251,6 +251,7 @@ inferSSRProps<typeof _getServerSideProps> & WithNonceProps<{}>) {
                   <Button
                     color="secondary"
                     className="w-full justify-center"
+                    disabled={formState.isSubmitting}
                     data-testid="google"
                     StartIcon={FaGoogle}
                     onClick={async (e) => {
diff --git a/apps/web/pages/signup.tsx b/apps/web/pages/signup.tsx
index 6f1002cbb6..0cae0e4ee2 100644
--- a/apps/web/pages/signup.tsx
+++ b/apps/web/pages/signup.tsx
@@ -323,6 +323,7 @@ export default function Signup({
                   !!formMethods.formState.errors.email ||
                   !formMethods.getValues("email") ||
                   !formMethods.getValues("password") ||
+                  isSubmitting ||
                   usernameTaken
                 }>
                 {premiumUsername && !usernameTaken
@@ -387,7 +388,9 @@ export default function Signup({
                     disabled={
                       !!formMethods.formState.errors.username ||
                       !!formMethods.formState.errors.email ||
-                      premiumUsername
+                      premiumUsername ||
+                      isSubmitting ||
+                      isGoogleLoading
                     }
                     className={classNames(
                       "w-full justify-center rounded-md text-center",
@@ -401,6 +404,7 @@ export default function Signup({
                       }
                       if (!formMethods.getValues("email")) {
                         formMethods.trigger("email");
+
                         return;
                       }
                       const username = formMethods.getValues("username");