diff --git a/ios/RNFirebase/RNFirebase.m b/ios/RNFirebase/RNFirebase.m
index 6f05d927..981d3893 100644
--- a/ios/RNFirebase/RNFirebase.m
+++ b/ios/RNFirebase/RNFirebase.m
@@ -1,6 +1,7 @@
 #import "RNFirebase.h"
 #import "RNFirebaseUtil.h"
 #import <FirebaseCore/FirebaseCore.h>
+#import <React/RCTUtils.h>
 
 @implementation RNFirebase
 RCT_EXPORT_MODULE(RNFirebase);
@@ -28,7 +29,7 @@ RCT_EXPORT_METHOD(initializeApp:
             callback:
             (RCTResponseSenderBlock) callback) {
 
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    RCTUnsafeExecuteOnMainQueueSync(^{
         FIRApp *existingApp = [RNFirebaseUtil getApp:appDisplayName];
 
         if (!existingApp) {
diff --git a/ios/RNFirebase/analytics/RNFirebaseAnalytics.m b/ios/RNFirebase/analytics/RNFirebaseAnalytics.m
index f896b06d..91de5476 100644
--- a/ios/RNFirebase/analytics/RNFirebaseAnalytics.m
+++ b/ios/RNFirebase/analytics/RNFirebaseAnalytics.m
@@ -1,4 +1,5 @@
 #import "RNFirebaseAnalytics.h"
+#import <React/RCTUtils.h>
 
 #if __has_include(<FirebaseAnalytics/FIRAnalytics.h>)
 #import <FirebaseAnalytics/FIRAnalytics.h>
@@ -16,7 +17,7 @@ RCT_EXPORT_METHOD(setAnalyticsCollectionEnabled:(BOOL) enabled) {
 }
 
 RCT_EXPORT_METHOD(setCurrentScreen:(NSString *) screenName screenClass:(NSString *) screenClassOverriew) {
-  dispatch_sync(dispatch_get_main_queue(), ^{
+  RCTUnsafeExecuteOnMainQueueSync(^{
     [FIRAnalytics setScreenName:screenName screenClass:screenClassOverriew];
   });
 }
diff --git a/ios/RNFirebase/storage/RNFirebaseStorage.m b/ios/RNFirebase/storage/RNFirebaseStorage.m
index 8048f7f9..8b470d44 100644
--- a/ios/RNFirebase/storage/RNFirebaseStorage.m
+++ b/ios/RNFirebase/storage/RNFirebaseStorage.m
@@ -7,6 +7,7 @@
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <Photos/Photos.h>
 #import <Firebase.h>
+#import <React/RCTUtils.h>
 
 @implementation RNFirebaseStorage
 
@@ -120,7 +121,7 @@ RCT_EXPORT_METHOD(downloadFile:(NSString *) appDisplayName
     NSURL *localFile = [NSURL fileURLWithPath:localPath];
     
     __block FIRStorageDownloadTask *downloadTask;
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    RCTUnsafeExecuteOnMainQueueSync(^{
         downloadTask = [fileRef writeToFile:localFile];
     });
 
@@ -298,7 +299,7 @@ RCT_EXPORT_METHOD(putFile:(NSString *) appDisplayName
 - (void)uploadFile:(NSString *)appDisplayName url:(NSURL *)url firmetadata:(FIRStorageMetadata *)firmetadata path:(NSString *)path resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
     FIRStorageReference *fileRef = [self getReference:path appDisplayName:appDisplayName];
     __block FIRStorageUploadTask *uploadTask;
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    RCTUnsafeExecuteOnMainQueueSync(^{
         uploadTask = [fileRef putFile:url metadata:firmetadata];
     });
     [self addUploadObservers:appDisplayName uploadTask:uploadTask path:path resolver:resolve rejecter:reject];
@@ -307,7 +308,7 @@ RCT_EXPORT_METHOD(putFile:(NSString *) appDisplayName
 - (void)uploadData:(NSString *)appDisplayName data:(NSData *)data firmetadata:(FIRStorageMetadata *)firmetadata path:(NSString *)path resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
     FIRStorageReference *fileRef = [self getReference:path appDisplayName:appDisplayName];
     __block FIRStorageUploadTask *uploadTask;
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    RCTUnsafeExecuteOnMainQueueSync(^{
         uploadTask = [fileRef putData:data metadata:firmetadata];
     });
     [self addUploadObservers:appDisplayName uploadTask:uploadTask path:path resolver:resolve rejecter:reject];