diff --git a/src/android/com/adobe/phonegap/push/FCMService.java b/src/android/com/adobe/phonegap/push/FCMService.java
index a96540507..5682afcb0 100644
--- a/src/android/com/adobe/phonegap/push/FCMService.java
+++ b/src/android/com/adobe/phonegap/push/FCMService.java
@@ -253,6 +253,11 @@ private Bundle normalizeExtras(Context context, Bundle extras, String messageKey
                 newExtras.putString(jsonKey, value);
               }
             }
+            else if (data.has(LOC_KEY) || data.has(LOC_DATA)) {
+              String newKey = normalizeKey(key, messageKey, titleKey);
+              Log.d(LOG_TAG, "replace key " + key + " with " + newKey);
+              replaceKey(context, key, newKey, extras, newExtras);
+            }
           } catch (JSONException e) {
             Log.e(LOG_TAG, "normalizeExtras: JSON exception");
           }