diff --git a/frontend/ui/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx b/frontend/ui/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
index ce01be57ba..99206ff3c1 100644
--- a/frontend/ui/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
+++ b/frontend/ui/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
@@ -59,11 +59,11 @@ const ConversationMetadata = (props: ConnectedProps<typeof connector>) => {
   };
 
   const filterForUnusedTags = (tags: TagModel[]): TagModel[] => {
-    return tags.filter(tag => !(tag.id in conversation.metadata.tags));
+    return tags.filter(tag => !(tag.id in (conversation.metadata.tags || {})));
   };
 
   const filterForUsedTags = (tags: TagModel[]): TagModel[] => {
-    return tags.filter(tag => tag.id in conversation.metadata.tags);
+    return tags.filter(tag => tag.id in (conversation.metadata.tags || {}));
   };
 
   const tagSorter = (tagA: TagModel, tagB: TagModel) => {