diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
index 309210ea41..f0c0e52b39 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -1025,7 +1025,9 @@ object RemoteConfig {
     key = "android.libsignalWebSocketEnabled",
     defaultValue = false,
     hotSwappable = false
-  )
+  ) { value ->
+    value.asBoolean(false) || Environment.IS_NIGHTLY
+  }
 
   /** Whether or not to launch the restore activity after registration is complete, rather than before.  */
   @JvmStatic