diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m b/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m
index 2910eadec..f6d4f00a6 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m
@@ -72,7 +72,7 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString *, OneSignalRequest *
     
     //execute on a background thread or the semaphore will block the caller thread
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+        dispatch_group_t group = dispatch_group_create();
         
         __block NSMutableDictionary<NSString *, NSError *> *errors = [NSMutableDictionary new];
         __block NSMutableDictionary<NSString *, NSDictionary *> *results = [NSMutableDictionary new];
@@ -80,18 +80,19 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString *, OneSignalRequest *
         for (NSString *identifier in requests.allKeys) {
             let request = requests[identifier];
             
+            //use a dispatch_group instead of a semaphore, in case the failureBlock gets called synchronously
+            //this will prevent the SDK from waiting/blocking on a request that instantly failed
+            dispatch_group_enter(group);
             [self executeRequest:request onSuccess:^(NSDictionary *result) {
                 results[identifier] = result;
-                dispatch_semaphore_signal(semaphore);
+                dispatch_group_leave(group);
             } onFailure:^(NSError *error) {
                 errors[identifier] = error;
-                dispatch_semaphore_signal(semaphore);
+                dispatch_group_leave(group);
             }];
         }
         
-        for (int i = 0; i < requests.count; i++) {
-            dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-        }
+        dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
         
         //requests should all be completed at this point
         dispatch_async(dispatch_get_main_queue(), ^{
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m b/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
index bd9f64a37..de1d9a152 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
@@ -79,6 +79,10 @@ + (void) endBackgroundFocusTask {
 
 + (void)onFocus:(BOOL)toBackground {
     
+    // return if the user has not granted privacy permissions
+    if ([OneSignal requiresUserPrivacyConsent])
+        return;
+    
     // Prevent the onFocus to be called twice when app being terminated
     //    - Both WillResignActive and willTerminate
     if (lastOnFocusWasToBackground == toBackground)