diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 0854bc412f..ece5d1d410 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -360,6 +360,9 @@ static int property_get_chassis(
         else
                 name = c->data[PROP_CHASSIS];
 
+        if(!name)
+                name = "";
+
         r = sd_bus_message_append(reply, "s", name);
         if (r < 0)
                 return r;