diff --git a/lib/Lacuna/RPC/Inbox.pm b/lib/Lacuna/RPC/Inbox.pm
index 07d38fe6..712fd8b6 100644
--- a/lib/Lacuna/RPC/Inbox.pm
+++ b/lib/Lacuna/RPC/Inbox.pm
@@ -72,7 +72,7 @@ sub read_message {
             has_archived=> $message->has_archived,
             in_reply_to => $message->in_reply_to,
             recipients  => $message->recipients,
-            tags        => [$message->tag],
+            tags        => (defined $message->tag ? [$message->tag] : []),
             attachments => $message->attachments,
         },
         status  => $self->format_status($session),
@@ -452,7 +452,7 @@ sub view_messages {
             has_read        => $message->has_read,
             has_replied     => $message->has_replied,
             body_preview    => substr($message->body,0,30),
-            tags            => [$message->tag],
+            tags            => (defined $message->tag ? [$message->tag] : []),
         };
     }
     return {