diff --git a/ios/RNFIRMessaging.m b/ios/RNFIRMessaging.m index cda5231ae50cf1d944ff465db509c644423db14e..bdb05987101093128b12f0286d532405c829c595 100644 --- a/ios/RNFIRMessaging.m +++ b/ios/RNFIRMessaging.m @@ -406,6 +406,10 @@ RCT_EXPORT_METHOD(getEntityFCMToken:(RCTPromiseResolveBlock)resolve rejecter:(RC NSString *entity = options.GCMSenderID; NSData * deviceToken = [FIRMessaging messaging].APNSToken; + if (deviceToken == nil) { + resolve(nil); + } + [[FIRInstanceID instanceID]tokenWithAuthorizedEntity:entity scope:kFIRInstanceIDScopeFirebaseMessaging options:@{@"apns_token": deviceToken} handler:^(NSString * _Nullable token, NSError * _Nullable error) { if (error != nil) {