--- a/mobile/android/base/java/org/mozilla/gecko/NotificationHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/NotificationHelper.java
@@ -115,17 +115,17 @@ public final class NotificationHelper im
         final Uri data = intent.getData();
 
         final String notificationType = data.getQueryParameter(EVENT_TYPE_ATTR);
 
         try {
             args.put(ID_ATTR, data.getQueryParameter(ID_ATTR));
             args.put(EVENT_TYPE_ATTR, notificationType);
             args.put(HANDLER_ATTR, data.getQueryParameter(HANDLER_ATTR));
-            args.put(COOKIE_ATTR, data.getQueryParameter(COOKIE_ATTR));
+            args.put(COOKIE_ATTR, intent.getStringExtra(COOKIE_ATTR));
 
             if (BUTTON_EVENT.equals(notificationType)) {
                 final String actionName = data.getQueryParameter(ACTION_ID_ATTR);
                 args.put(ACTION_ID_ATTR, actionName);
             }
 
             Log.i(LOGTAG, "Send " + args.toString());
             GeckoAppShell.notifyObservers("Notification:Event", args.toString());