diff --git a/server/socket-handlers/cloudflared-socket-handler.js b/server/socket-handlers/cloudflared-socket-handler.js
index 4c34f52f5..efb1f0658 100644
--- a/server/socket-handlers/cloudflared-socket-handler.js
+++ b/server/socket-handlers/cloudflared-socket-handler.js
@@ -63,7 +63,10 @@ module.exports.cloudflaredSocketHandler = (socket) => {
     socket.on(prefix + "stop", async (currentPassword, callback) => {
         try {
             checkLogin(socket);
-            await doubleCheckPassword(socket, currentPassword);
+            const disabledAuth = await setting("disableAuth");
+            if (!disabledAuth) {
+                await doubleCheckPassword(socket, currentPassword);
+            }
             cloudflared.stop();
         } catch (error) {
             callback({
diff --git a/src/components/settings/ReverseProxy.vue b/src/components/settings/ReverseProxy.vue
index e93bd0ef2..616b0996e 100644
--- a/src/components/settings/ReverseProxy.vue
+++ b/src/components/settings/ReverseProxy.vue
@@ -68,7 +68,9 @@
                 <Confirm ref="confirmStop" btn-style="btn-danger" :yes-text="$t('Stop') + ' cloudflared'" :no-text="$t('Cancel')" @yes="stop">
                     {{ $t("The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.") }}
 
-                    <div class="mt-3">
+                    <p class="mt-2">{{ $t("disableCloudflaredNoAuthMsg") }}</p>
+
+                    <div v-if="!settings.disableAuth" class="mt-3">
                         <label for="current-password2" class="form-label">
                             {{ $t("Current Password") }}
                         </label>
@@ -108,7 +110,9 @@ export default {
         return this.$root.cloudflared;
     },
     computed: {
-
+        settings() {
+            return this.$parent.$parent.$parent.settings;
+        },
     },
     watch: {
 
diff --git a/src/languages/en.js b/src/languages/en.js
index ff03fd0ef..9aeedd9de 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -535,4 +535,5 @@ export default {
     "ntfy Topic": "ntfy Topic",
     "Domain": "Domain",
     "Workstation": "Workstation",
+    disableCloudflaredNoAuthMsg: "You are in No Auth mode, password is not require.",
 };