diff --git a/ios/RNFIRMessaging.xcodeproj/xcuserdata/LLu.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/RNFIRMessaging.xcodeproj/xcuserdata/LLu.xcuserdatad/xcschemes/xcschememanagement.plist
index a3337cbe077330c0627edc840d49af67d735c5e5..337688654f154a83a84bff20b88b50485add62d5 100644
--- a/ios/RNFIRMessaging.xcodeproj/xcuserdata/LLu.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/ios/RNFIRMessaging.xcodeproj/xcuserdata/LLu.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>RNFIRMessaging.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/ios/RNFIRMesssaging.m b/ios/RNFIRMesssaging.m
index 826633e5069ab4b0bbf47dfc1f03986e0b385683..993cb2d4e3d480a2171a6a3ec8786b263f06f1bb 100644
--- a/ios/RNFIRMesssaging.m
+++ b/ios/RNFIRMesssaging.m
@@ -50,7 +50,12 @@ RCT_ENUM_CONVERTER(NSCalendarUnit,
   content.userInfo = details;
   content.badge = [RCTConvert NSNumber:details[@"badge"]];
   
-  NSDate *fireDate = [RCTConvert NSDate:details[@"fire_date"]] ?: [NSDate date];
+  NSDate *fireDate = [RCTConvert NSDate:details[@"fire_date"]];
+  
+  if(fireDate == nil){
+    return [UNNotificationRequest requestWithIdentifier:[RCTConvert NSString:details[@"id"]] content:content trigger:nil];
+  }
+  
   NSCalendarUnit interval = [RCTConvert NSCalendarUnit:details[@"repeat_interval"]];
   NSCalendarUnit unitFlags;
   switch (interval) {