diff --git a/fe/src/views/Setup/Setup.js b/fe/src/views/Setup/Setup.js
index 2891f622..6ea7e85e 100644
--- a/fe/src/views/Setup/Setup.js
+++ b/fe/src/views/Setup/Setup.js
@@ -596,13 +596,35 @@ export function usePage() {
     })
   }
 
+  const resetDNSChallenge = () => {
+    stopStatusCheck()
+    stopDNSChallengeTimer()
+    stopDNSParamsPolling()
+    dnsChecking.value = false
+    dnsChallengeNotice.value = ""
+    sslSettings.paramsList = []
+    fullscreenLoading.value = false
+  }
+
+  const handleSSLTypeChange = () => {
+    if (dnsChecking.value) {
+      resetDNSChallenge()
+    }
+  }
+
   const handleSSLChallengeChange = (challenge) => {
-    if (challenge !== "dns" || dnsChecking.value || fullscreenLoading.value) {
+    if (fullscreenLoading.value) {
       return
     }
 
-    dnsChallengeNotice.value = ""
-    return setSSLConfig()
+    if (challenge === "dns") {
+      dnsChallengeNotice.value = ""
+      return setSSLConfig()
+    }
+
+    if (dnsChecking.value) {
+      resetDNSChallenge()
+    }
   }
 
   const runStep = (action) => {
@@ -703,6 +725,7 @@ export function usePage() {
     getDomainConfig,
     setDbConfig,
     handleDbTypeChange,
+    handleSSLTypeChange,
     clearDatabaseError,
     getDNSConfig,
     formatDNSRecordTTL,
diff --git a/fe/src/views/Setup/Setup.vue b/fe/src/views/Setup/Setup.vue
index 072fb359..a974da14 100644
--- a/fe/src/views/Setup/Setup.vue
+++ b/fe/src/views/Setup/Setup.vue
@@ -289,7 +289,8 @@
       <div class="form ssl-form">
         <el-form label-position="top">
           <el-form-item :label="lang.type">
-            <el-select class="ssl-type-select" :placeholder="lang.ssl_auto" v-model="sslSettings.type" :disabled="dnsChecking">
+            <el-select class="ssl-type-select" :placeholder="lang.ssl_auto" v-model="sslSettings.type"
+                       :disabled="fullscreenLoading" @change="handleSSLTypeChange">
               <el-option :label="lang.ssl_auto" value="0"/>
               <el-option :label="lang.ssl_manuallyf" value="1"/>
             </el-select>
@@ -298,7 +299,7 @@
           <el-form-item :label="lang.ssl_challenge_type" v-if="sslSettings.type === '0'">
             <div class="ssl-challenge-select-row">
               <el-select class="ssl-type-select" :placeholder="lang.ssl_auto_http" v-model="sslSettings.challenge"
-                         :disabled="dnsChecking || fullscreenLoading" @change="handleSSLChallengeChange">
+                         :disabled="fullscreenLoading" @change="handleSSLChallengeChange">
                 <el-option :label="lang.ssl_auto_http" value="http"/>
                 <el-option :label="lang.ssl_auto_dns" value="dns"/>
               </el-select>
@@ -409,6 +410,7 @@ const {
   next,
   previous,
   handleDbTypeChange,
+  handleSSLTypeChange,
   handleSSLChallengeChange,
   clearDatabaseError,
   formatDNSRecordTTL,