diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index 2f20aa7d..c5df94db 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -711,10 +711,9 @@ unchanged ADDRESS if parsing fails."
 	    (face (if match
 			  'notmuch-pick-match-tag-face
 			'notmuch-pick-no-match-tag-face)))
-	(when tags
-	  (insert (propertize (format format-string
-				      (mapconcat #'identity tags ", "))
-			      'face face))))))))
+	(insert (propertize (format format-string
+				    (mapconcat #'identity tags ", "))
+			    'face face)))))))
 
 (defun notmuch-pick-insert-msg (msg)
   "Insert the message MSG according to notmuch-pick-result-format"