diff --git a/apps/browser/config/base.json b/apps/browser/config/base.json
index 6c428c43d26..b6f24bf9ae3 100644
--- a/apps/browser/config/base.json
+++ b/apps/browser/config/base.json
@@ -2,7 +2,7 @@
   "devFlags": {},
   "flags": {
     "showPasswordless": true,
-    "enableCipherKeyEncryption": false,
+    "enableCipherKeyEncryption": true,
     "accountSwitching": false
   }
 }
diff --git a/apps/browser/config/development.json b/apps/browser/config/development.json
index e0925ebecc9..950c5372d8f 100644
--- a/apps/browser/config/development.json
+++ b/apps/browser/config/development.json
@@ -7,7 +7,7 @@
   },
   "flags": {
     "showPasswordless": true,
-    "enableCipherKeyEncryption": false,
+    "enableCipherKeyEncryption": true,
     "accountSwitching": true
   }
 }
diff --git a/apps/browser/config/production.json b/apps/browser/config/production.json
index 027003f6c75..64c6cb92a3b 100644
--- a/apps/browser/config/production.json
+++ b/apps/browser/config/production.json
@@ -1,6 +1,6 @@
 {
   "flags": {
-    "enableCipherKeyEncryption": false,
+    "enableCipherKeyEncryption": true,
     "accountSwitching": true
   }
 }
diff --git a/apps/cli/config/development.json b/apps/cli/config/development.json
index f57c3d9bc38..bc06f69d657 100644
--- a/apps/cli/config/development.json
+++ b/apps/cli/config/development.json
@@ -1,5 +1,5 @@
 {
   "flags": {
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/cli/config/production.json b/apps/cli/config/production.json
index f57c3d9bc38..bc06f69d657 100644
--- a/apps/cli/config/production.json
+++ b/apps/cli/config/production.json
@@ -1,5 +1,5 @@
 {
   "flags": {
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/desktop/config/base.json b/apps/desktop/config/base.json
index 1f4f624dc8a..2c7b4dcae16 100644
--- a/apps/desktop/config/base.json
+++ b/apps/desktop/config/base.json
@@ -2,6 +2,6 @@
   "devFlags": {},
   "flags": {
     "multithreadDecryption": false,
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/desktop/config/development.json b/apps/desktop/config/development.json
index 7a8659feffe..7f18c63878b 100644
--- a/apps/desktop/config/development.json
+++ b/apps/desktop/config/development.json
@@ -1,6 +1,6 @@
 {
   "devFlags": {},
   "flags": {
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/desktop/config/production.json b/apps/desktop/config/production.json
index f57c3d9bc38..bc06f69d657 100644
--- a/apps/desktop/config/production.json
+++ b/apps/desktop/config/production.json
@@ -1,5 +1,5 @@
 {
   "flags": {
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/web/config/base.json b/apps/web/config/base.json
index 5dc03a4633d..b9102a769d7 100644
--- a/apps/web/config/base.json
+++ b/apps/web/config/base.json
@@ -12,6 +12,6 @@
   },
   "flags": {
     "showPasswordless": false,
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/web/config/cloud.json b/apps/web/config/cloud.json
index 3faa2926929..c8ba07e755e 100644
--- a/apps/web/config/cloud.json
+++ b/apps/web/config/cloud.json
@@ -18,6 +18,6 @@
   },
   "flags": {
     "showPasswordless": true,
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/web/config/development.json b/apps/web/config/development.json
index 44391a7450d..3fcd8641b32 100644
--- a/apps/web/config/development.json
+++ b/apps/web/config/development.json
@@ -21,7 +21,7 @@
   ],
   "flags": {
     "showPasswordless": true,
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   },
   "devFlags": {}
 }
diff --git a/apps/web/config/euprd.json b/apps/web/config/euprd.json
index 72f0c1857d9..2d554e57043 100644
--- a/apps/web/config/euprd.json
+++ b/apps/web/config/euprd.json
@@ -12,6 +12,6 @@
   },
   "flags": {
     "showPasswordless": true,
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/web/config/qa.json b/apps/web/config/qa.json
index ac36b107846..f03d47fe4ee 100644
--- a/apps/web/config/qa.json
+++ b/apps/web/config/qa.json
@@ -28,6 +28,6 @@
   ],
   "flags": {
     "showPasswordless": true,
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }
diff --git a/apps/web/config/selfhosted.json b/apps/web/config/selfhosted.json
index 7e916a11169..121f59ba0b3 100644
--- a/apps/web/config/selfhosted.json
+++ b/apps/web/config/selfhosted.json
@@ -8,6 +8,6 @@
   },
   "flags": {
     "showPasswordless": true,
-    "enableCipherKeyEncryption": false
+    "enableCipherKeyEncryption": true
   }
 }