diff --git a/src/js/setup.js b/src/js/setup.js
index 9d04adef8..df0f11cc3 100644
--- a/src/js/setup.js
+++ b/src/js/setup.js
@@ -47,26 +47,36 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
         });
     };
 
+    function redirectIfNeeded(status) {
+        if ('develop' in search || localStorage.getItem('develop')) {
+            console.warn('Cloudron develop mode on. To disable run localStorage.removeItem(\'develop\')');
+            localStorage.setItem('develop', true);
+            return;
+        }
+
+        // if we are here from the ip first go to the real domain if already setup
+        if (status.adminFqdn && status.adminFqdn !== window.location.hostname) {
+            window.location.href = 'https://' + status.adminFqdn + '/setup.html';
+            return;
+        }
+
+        // if we don't have a domain yet, first go to domain setup
+        if (!status.adminFqdn) {
+            window.location.href = '/setupdns.html';
+            return;
+        }
+
+        if (status.activated) {
+            window.location.href = '/';
+            return;
+        }
+    }
+
     function init() {
         Client.getStatus(function (error, status) {
             if (error) return Client.initError(error, init);
 
-            // if we are here from the ip first go to the real domain if already setup
-            if (status.adminFqdn && status.adminFqdn !== window.location.hostname) {
-                window.location.href = 'https://' + status.adminFqdn + '/setup.html';
-                return;
-            }
-
-            // if we don't have a domain yet, first go to domain setup
-            if (!status.adminFqdn) {
-                window.location.href = '/setupdns.html';
-                return;
-            }
-
-            if (status.activated) {
-                window.location.href = '/';
-                return;
-            }
+            redirectIfNeeded(status);
 
             $scope.apiServerOrigin = status.apiServerOrigin;
             $scope.webServerOrigin = status.webServerOrigin;