diff --git a/jami-android/app/src/withUnifiedPush/java/cx/ring/services/JamPushReceiver.kt b/jami-android/app/src/withUnifiedPush/java/cx/ring/services/JamPushReceiver.kt
index 605aac185c9f19564b329aa4827b8ac213db983b..c49a3cab787eeb7b25ef0b0e62531fb720bb578c 100644
--- a/jami-android/app/src/withUnifiedPush/java/cx/ring/services/JamPushReceiver.kt
+++ b/jami-android/app/src/withUnifiedPush/java/cx/ring/services/JamPushReceiver.kt
@@ -29,11 +29,15 @@ import java.net.URI
 class JamiPushReceiver : MessagingReceiver() {
     override fun onMessage(context: Context, message: ByteArray, instance: String) {
         Log.w("JamiPushReceiver", "onMessage ${String(message)} $instance")
-        val obj = JSONObject(String(message))
-        val msg = HashMap<String, String>()
-        obj.keys().forEach { msg[it] = obj.getString(it) }
-        val app = JamiApplication.instance as JamiApplicationUnifiedPush?
-        app?.onMessage(msg)
+        try {
+            val obj = JSONObject(String(message))
+            val msg = HashMap<String, String>()
+            obj.keys().forEach { msg[it] = obj.getString(it) }
+            val app = JamiApplication.instance as JamiApplicationUnifiedPush?
+            app?.onMessage(msg)
+        } catch(e: Exception) {
+            Log.e("JamiPushReceiver", "onMessage", e)
+        }
     }
 
     override fun onNewEndpoint(context: Context, endpoint: String, instance: String) {