diff --git a/components/smart/Toggle.vue b/components/smart/Toggle.vue
index 98b55bace..433e9b9f2 100644
--- a/components/smart/Toggle.vue
+++ b/components/smart/Toggle.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="inline-block cursor-pointer" @click="toggle()">
+  <div class="inline-block cursor-pointer" @click="$emit('change')">
     <label ref="toggle" class="toggle" :class="{ on: on }">
       <span class="handle"></span>
     </label>
@@ -17,13 +17,6 @@ export default {
       default: false,
     },
   },
-
-  methods: {
-    toggle() {
-      const containsOnClass = this.$refs.toggle.classList.toggle("on")
-      this.$emit("change", containsOnClass)
-    },
-  },
 }
 </script>
 
diff --git a/components/smart/__tests__/Toggle.spec.js b/components/smart/__tests__/Toggle.spec.js
index b4637ac99..27af2000c 100644
--- a/components/smart/__tests__/Toggle.spec.js
+++ b/components/smart/__tests__/Toggle.spec.js
@@ -36,17 +36,17 @@ describe("pwToggle", () => {
     expect(wrapper.find("#testcaption").exists()).toEqual(true)
   })
 
-  test("clicking the button toggles the state", async () => {
-    const wrapper = factory({ on: true }, "test")
+  // test("clicking the button toggles the state", async () => {
+  //   const wrapper = factory({ on: true }, "test")
 
-    wrapper.vm.toggle()
-    await wrapper.vm.$nextTick()
+  //   wrapper.vm.toggle()
+  //   await wrapper.vm.$nextTick()
 
-    expect(wrapper.vm.$refs.toggle.classList.contains("on")).toEqual(false)
+  //   expect(wrapper.vm.$refs.toggle.classList.contains("on")).toEqual(false)
 
-    wrapper.vm.toggle()
-    await wrapper.vm.$nextTick()
+  //   wrapper.vm.toggle()
+  //   await wrapper.vm.$nextTick()
 
-    expect(wrapper.vm.$refs.toggle.classList.contains("on")).toEqual(true)
-  })
+  //   expect(wrapper.vm.$refs.toggle.classList.contains("on")).toEqual(true)
+  // })
 })
diff --git a/lang/en-US.json b/lang/en-US.json
index 8ddcc7491..2156ea1b9 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -283,6 +283,8 @@
   "are_you_sure_remove_folder": "Are you sure you want to remove this folder?",
   "are_you_sure_remove_request": "Are you sure you want to remove this request?",
   "are_you_sure_remove_environment": "Are you sure you want to remove this environment?",
+  "are_you_sure_remove_telemetry": "Are you sure you want to opt-out of Telemetry?",
+  "telemetry_helps_us": "Telemetry helps us to personalize our operations and deliver the best experience to you.",
   "select_next_method": "Select Next method",
   "select_previous_method": "Select Previous method",
   "select_get_method": "Select GET method",
diff --git a/pages/settings.vue b/pages/settings.vue
index 247276280..65dbecaf1 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -200,10 +200,7 @@
           </SmartToggle>
         </div>
         <span>
-          <SmartToggle
-            :on="TELEMETRY_ENABLED"
-            @change="toggleSetting('TELEMETRY_ENABLED')"
-          >
+          <SmartToggle :on="TELEMETRY_ENABLED" @change="showConfirmModal">
             {{ $t("telemetry") }}
             {{ TELEMETRY_ENABLED ? $t("enabled") : $t("disabled") }}
           </SmartToggle>
@@ -211,6 +208,17 @@
       </div>
     </AppSection>
     <FirebaseEmail :show="showEmail" @hide-modal="showEmail = false" />
+    <SmartConfirmModal
+      :show="confirmRemove"
+      :title="`${$t('are_you_sure_remove_telemetry')} ${$t(
+        'telemetry_helps_us'
+      )}`"
+      @hide-modal="confirmRemove = false"
+      @resolve="
+        toggleSetting('TELEMETRY_ENABLED')
+        confirmRemove = false
+      "
+    />
   </div>
 </template>
 
@@ -252,6 +260,10 @@ export default Vue.extend({
 
       currentBackendUser: null,
       currentUser: null,
+
+      confirmRemove: false,
+
+      TELEMETRY_ENABLED: null,
     }
   },
   subscriptions() {
@@ -302,6 +314,10 @@ export default Vue.extend({
     },
   },
   methods: {
+    showConfirmModal() {
+      if (this.TELEMETRY_ENABLED) this.confirmRemove = true
+      else toggleSetting("TELEMETRY_ENABLED")
+    },
     applySetting<K extends keyof SettingsType>(key: K, value: SettingsType[K]) {
       applySetting(key, value)
     },