diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
index 9c4abe16348ea9e764d7ea81c4be281c6906c096..018a5215b1b2da41636aa962b0a122d1522cddc3 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
@@ -28,6 +28,11 @@ public class FIRMessagingPackage implements ReactPackage {
         return Collections.emptyList();
     }
 
+    @Override
+    public List<Class<? extends JavaScriptModule>> createJSModules() {
+        return Collections.emptyList();
+    }
+ 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Arrays.<ViewManager>asList();
diff --git a/ios/RNFIRMessaging.m b/ios/RNFIRMessaging.m
index f4b64ad1915cb03766afc44c7541ef149dc05741..a17d876c55f6b245793d1f0117a5128301cbaa37 100644
--- a/ios/RNFIRMessaging.m
+++ b/ios/RNFIRMessaging.m
@@ -225,7 +225,13 @@ RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve rejecte
 
 RCT_EXPORT_METHOD(getAPNSToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    resolve([FIRMessaging messaging].APNSToken);
+    NSData * deviceToken = [FIRMessaging messaging].APNSToken;
+    const char *data = [deviceToken bytes];
+    NSMutableString *token = [NSMutableString string];
+    for (NSUInteger i = 0; i < [deviceToken length]; i++) {
+        [token appendFormat:@"%02.2hhX", data[i]];
+    }
+    resolve([token copy]);
 }
 
 RCT_EXPORT_METHOD(getFCMToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)