diff --git a/src/Commands/QueryTags.cs b/src/Commands/QueryTags.cs
index dd5eaa47..4b706439 100644
--- a/src/Commands/QueryTags.cs
+++ b/src/Commands/QueryTags.cs
@@ -29,13 +29,17 @@ namespace SourceGit.Commands
                     continue;
 
                 var name = subs[0].Substring(10);
+                var message = subs[5].Trim();
+                if (!string.IsNullOrEmpty(message) && message.Equals(name, StringComparison.Ordinal))
+                    message = null;
+
                 tags.Add(new Models.Tag()
                 {
                     Name = name,
                     IsAnnotated = subs[1].Equals("tag", StringComparison.Ordinal),
                     SHA = string.IsNullOrEmpty(subs[3]) ? subs[2] : subs[3],
                     CreatorDate = ulong.Parse(subs[4]),
-                    Message = subs[5].Trim(),
+                    Message = message,
                 });
             }
 
diff --git a/src/Views/TagsView.axaml b/src/Views/TagsView.axaml
index f8e6f8d7..94898bad 100644
--- a/src/Views/TagsView.axaml
+++ b/src/Views/TagsView.axaml
@@ -38,7 +38,7 @@
                       </Border>
                     </StackPanel>
 
-                    <TextBlock Text="{Binding Message}" IsVisible="{Binding Message, Converter={x:Static c:StringConverters.IsNotNullOrWhitespace}}"/>
+                    <TextBlock Text="{Binding Message}" IsVisible="{Binding Message, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
                   </StackPanel>
                 </DataTemplate>
               </Border.DataTemplates>
@@ -95,7 +95,7 @@
                     </Border>
                   </StackPanel>
 
-                  <TextBlock Text="{Binding Message}" IsVisible="{Binding Message, Converter={x:Static c:StringConverters.IsNotNullOrWhitespace}}"/>
+                  <TextBlock Text="{Binding Message}" IsVisible="{Binding Message, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
                 </StackPanel>
               </ToolTip.Tip>