diff --git a/mobile/src/main/java/org/openhab/habdroid/model/CloudNotification.kt b/mobile/src/main/java/org/openhab/habdroid/model/CloudNotification.kt
index 825e28b053..646aaa3b2f 100644
--- a/mobile/src/main/java/org/openhab/habdroid/model/CloudNotification.kt
+++ b/mobile/src/main/java/org/openhab/habdroid/model/CloudNotification.kt
@@ -133,7 +133,7 @@ fun JSONObject.toCloudMessage(): CloudMessage? {
             CloudMessage.CloudNotification(
                 id = id,
                 title = payload?.optString("title").orEmpty(),
-                message = payload?.getString("message") ?: getString("message"),
+                message = payload?.optString("message", "") ?: getString("message"),
                 createdTimestamp = created,
                 icon = (payload?.optStringOrNull("icon") ?: optStringOrNull("icon")).toIconResource(),
                 tag = tag,