diff --git a/packages/webapp/src/components/CustomSignUp/index.jsx b/packages/webapp/src/components/CustomSignUp/index.jsx
index 2195a76412..378768c44a 100644
--- a/packages/webapp/src/components/CustomSignUp/index.jsx
+++ b/packages/webapp/src/components/CustomSignUp/index.jsx
@@ -47,12 +47,16 @@ export default function PureCustomSignUp({
             </div>
           )}
 
-          <div data-cy="continueGoogle" className={styles.ssoButton}>
-            {GoogleLoginButton}
-          </div>
-          <div className={styles.lineBreak}>
-            <LineBreak />
-          </div>
+          {GoogleLoginButton && (
+            <div data-cy="continueGoogle" className={styles.ssoButton}>
+              {GoogleLoginButton}
+            </div>
+          )}
+          {GoogleLoginButton && (
+            <div className={styles.lineBreak}>
+              <LineBreak />
+            </div>
+          )}
 
           <div className={styles.continueButton}>
             <Input data-cy="email" classes={inputClasses} {...inputs[0]} />
diff --git a/packages/webapp/src/containers/CustomSignUp/index.jsx b/packages/webapp/src/containers/CustomSignUp/index.jsx
index fe336b8cc1..85ba19fd38 100644
--- a/packages/webapp/src/containers/CustomSignUp/index.jsx
+++ b/packages/webapp/src/containers/CustomSignUp/index.jsx
@@ -32,6 +32,8 @@ const PureCustomSignUpStyle = {
   },
 };
 
+const showGoogleOAuth = !!import.meta.env.VITE_GOOGLE_OAUTH_CLIENT_ID;
+
 function CustomSignUp() {
   const {
     register,
@@ -168,7 +170,9 @@ function CustomSignUp() {
           classes={PureCustomSignUpStyle}
           onSubmit={handleSubmit(onSubmit)}
           disabled={disabled}
-          GoogleLoginButton={<GoogleLoginButton className={'google-login-button'} />}
+          GoogleLoginButton={
+            showGoogleOAuth && <GoogleLoginButton className={'google-login-button'} />
+          }
           isChrome={isChrome()}
           errorMessage={errorMessage}
           inputs={[