diff --git a/packages/messaging/e2e/messaging.e2e.js b/packages/messaging/e2e/messaging.e2e.js
index acb767e5c25..14978c85026 100644
--- a/packages/messaging/e2e/messaging.e2e.js
+++ b/packages/messaging/e2e/messaging.e2e.js
@@ -142,7 +142,7 @@ describe('messaging()', function () {
 
   describe('getInitialNotification', function () {
     it('returns null when no initial notification', async function () {
-      should.equal(await firebase.messaging().getInitialNotification(), null);
+      should.strictEqual(await firebase.messaging().getInitialNotification(), null);
     });
   });
 
diff --git a/packages/messaging/lib/index.js b/packages/messaging/lib/index.js
index 343bfd20352..4be7796a2ff 100644
--- a/packages/messaging/lib/index.js
+++ b/packages/messaging/lib/index.js
@@ -122,7 +122,12 @@ class FirebaseMessagingModule extends FirebaseModule {
   }
 
   getInitialNotification() {
-    return this.native.getInitialNotification();
+    return this.native.getInitialNotification().then(value => {
+      if (value) {
+        return value;
+      }
+      return null;
+    });
   }
 
   getIsHeadless() {