diff --git a/ios/Firestack/Firestack.m b/ios/Firestack/Firestack.m
index 8d88e1a..284f38b 100644
--- a/ios/Firestack/Firestack.m
+++ b/ios/Firestack/Firestack.m
@@ -239,7 +239,9 @@ - (FIRApp *) firebaseApp
             
             // if (!self.configured) {
             
-            [FIRApp configureWithOptions:finalOptions];
+            if ([FIRApp defaultApp] == NULL) {
+                [FIRApp configureWithOptions:finalOptions];
+            }            
             [Firestack initializeFirestack:self];
             callback(@[[NSNull null], props]);
         }
diff --git a/ios/Firestack/FirestackDatabase.m b/ios/Firestack/FirestackDatabase.m
index a1fcb6f..fbc7cf1 100644
--- a/ios/Firestack/FirestackDatabase.m
+++ b/ios/Firestack/FirestackDatabase.m
@@ -240,7 +240,11 @@ @implementation FirestackDatabase
 RCT_EXPORT_METHOD(enablePersistence:(BOOL) enable
   callback:(RCTResponseSenderBlock) callback)
 {
-  [FIRDatabase database].persistenceEnabled = enable;
+    
+  BOOL isEnabled = [FIRDatabase database].persistenceEnabled;
+  if ( isEnabled != enable) {
+    [FIRDatabase database].persistenceEnabled = enable;
+  }
   callback(@[[NSNull null], @{
     @"result": @"success"
   }]);