diff --git a/godtools/App/Share/Data/RemoteConfigRepository/RemoteConfigDataModel.swift b/godtools/App/Share/Data/RemoteConfigRepository/RemoteConfigDataModel.swift
index f647aab7c..213887a30 100644
--- a/godtools/App/Share/Data/RemoteConfigRepository/RemoteConfigDataModel.swift
+++ b/godtools/App/Share/Data/RemoteConfigRepository/RemoteConfigDataModel.swift
@@ -10,5 +10,5 @@ import Foundation
 
 struct RemoteConfigDataModel {
     
-    let globalActivityIsEnabled: Bool
+    let globalActivityIsEnabled: Bool?
 }
diff --git a/godtools/App/Share/Data/RemoteConfigRepository/RemoteDatabase/FirebaseRemoteConfigWrapper.swift b/godtools/App/Share/Data/RemoteConfigRepository/RemoteDatabase/FirebaseRemoteConfigWrapper.swift
index 724671413..a5fdac761 100644
--- a/godtools/App/Share/Data/RemoteConfigRepository/RemoteDatabase/FirebaseRemoteConfigWrapper.swift
+++ b/godtools/App/Share/Data/RemoteConfigRepository/RemoteDatabase/FirebaseRemoteConfigWrapper.swift
@@ -43,11 +43,9 @@ class FirebaseRemoteConfigWrapper: RemoteConfigRemoteDatabaseInterface {
         
         let globalActivityIsEnabledValue: RemoteConfigValue? = remoteConfig.configValue(forKey: "ui_account_globalactivity_enabled")
         
-        guard let globalActivityIsEnabled = globalActivityIsEnabledValue?.boolValue else {
-            return nil
-        }
-        
-        return RemoteConfigDataModel(globalActivityIsEnabled: globalActivityIsEnabled)
+        return RemoteConfigDataModel(
+            globalActivityIsEnabled: globalActivityIsEnabledValue?.boolValue
+        )
     }
 }