diff --git a/client/dispatch-query.py b/client/dispatch-query.py
index 78b625d..ed5f6bf 100755
--- a/client/dispatch-query.py
+++ b/client/dispatch-query.py
@@ -58,6 +58,8 @@ def ntfy_send(dispatch_uuid, user_topic, title, message, ntfy_push_target, ntfy_
     '''Send message via NTFY topic'''
 
     # limit message length and title #
+    title = title or ""
+    message = message or ""
     message = message[:1024]
     title = title[:512]