diff --git a/SignalServiceKit/SecureValueRecovery/LocalStorage/AccountKeyStore.swift b/SignalServiceKit/SecureValueRecovery/LocalStorage/AccountKeyStore.swift
index 1ff092fec7..e724d967d5 100644
--- a/SignalServiceKit/SecureValueRecovery/LocalStorage/AccountKeyStore.swift
+++ b/SignalServiceKit/SecureValueRecovery/LocalStorage/AccountKeyStore.swift
@@ -38,10 +38,7 @@ public class AccountKeyStore {
     }
 
     public func getMasterKey(tx: DBReadTransaction) -> MasterKey? {
-        if
-            FeatureFlags.enableAccountEntropyPool,
-            let aepDerivedKey = getAccountEntropyPool(tx: tx)?.getMasterKey()
-        {
+        if let aepDerivedKey = getAccountEntropyPool(tx: tx)?.getMasterKey() {
             return aepDerivedKey
         }
         // No AEP? Try fetching from the legacy location
diff --git a/SignalServiceKit/Util/FeatureFlags.swift b/SignalServiceKit/Util/FeatureFlags.swift
index 8b64198d8a..58542b6334 100644
--- a/SignalServiceKit/Util/FeatureFlags.swift
+++ b/SignalServiceKit/Util/FeatureFlags.swift
@@ -60,7 +60,7 @@ public enum FeatureFlags {
 
     public static let useNewConversationLoadIndex = true
 
-    public static let enableAccountEntropyPool = build.includes(.dev)
+    public static let enableAccountEntropyPool = true
 
     public static let libsignalForChat = build.includes(.beta)
 }