diff --git a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
index cb2faa73900bedfa01b89ab9e982b40623b78614..befe10605a57a523e7ec6fecb6ad36d7d20822f4 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
@@ -238,14 +238,13 @@ public class FIRLocalMessagingHelper {
 
         //store intent
         SharedPreferences.Editor editor = sharedPreferences.edit();
-        JSONObject json = null;
         try {
-            json = BundleJSONConverter.convertToJSON(bundle);
+            JSONObject json = BundleJSONConverter.convertToJSON(bundle);
+            editor.putString(notificationId, json.toString());
+            editor.apply();
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        editor.putString(notificationId, json.toString());
-        editor.apply();
     }
 
     public void cancelLocalNotification(String notificationId) {
diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
index 6f62c549f7fcf00d370e35a16a932e522427fb68..ae0322ce683f06deb33266212fb3cb496d82aaab 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -144,7 +144,7 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
                     Map<String, String> data = message.getData();
                     Set<String> keysIterator = data.keySet();
                     for(String key: keysIterator){
-                        params.putString(key, (String) data.get(key));
+                        params.putString(key, data.get(key));
                     }
                 }
                 sendEvent("FCMNotificationReceived", params);