diff --git a/next.config.js b/next.config.js
index 58e0561f..8efb45bc 100644
--- a/next.config.js
+++ b/next.config.js
@@ -65,10 +65,10 @@ const redirects = [
   },
 ];
 
-if (process.env.CLOUD_MODE) {
+if (process.env.CLOUD_MODE && process.env.DISABLE_LOGIN && process.env.CLOUD_URL) {
   redirects.push({
     source: '/login',
-    destination: CLOUD_URL,
+    destination: process.env.CLOUD_URL,
     permanent: false,
   });
 }
diff --git a/pages/login.js b/pages/login.js
index 88c19121..9a1f3c45 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -16,7 +16,7 @@ export default function LoginPage({ disabled }) {
 export async function getServerSideProps() {
   return {
     props: {
-      disabled: !!(process.env.DISABLE_LOGIN || process.env.CLOUD_MODE),
+      disabled: !!process.env.DISABLE_LOGIN,
     },
   };
 }