diff --git a/Source/Game/Entities/Creature/Gossip.cs b/Source/Game/Entities/Creature/Gossip.cs
index dcbc4a392..40cb321df 100644
--- a/Source/Game/Entities/Creature/Gossip.cs
+++ b/Source/Game/Entities/Creature/Gossip.cs
@@ -280,7 +280,7 @@ namespace Game.Misc
                     text.QuestType = item.QuestIcon;
                     text.QuestFlags = (uint)quest.Flags;
                     text.QuestFlagsEx = (uint)quest.FlagsEx;
-                    text.Repeatable = quest.IsRepeatable() && !quest.IsDailyOrWeekly() && !quest.IsMonthly();
+                    text.Repeatable = quest.IsAutoComplete() && quest.IsRepeatable() && !quest.IsDailyOrWeekly() && !quest.IsMonthly();
 
                     text.QuestTitle = quest.LogTitle;
                     Locale locale = _session.GetSessionDbLocaleIndex();
@@ -372,7 +372,7 @@ namespace Game.Misc
                     text.QuestType = questMenuItem.QuestIcon;
                     text.QuestFlags = (uint)quest.Flags;
                     text.QuestFlagsEx = (uint)quest.FlagsEx;
-                    text.Repeatable = quest.IsRepeatable() && !quest.IsDailyOrWeekly() && !quest.IsMonthly();
+                    text.Repeatable = quest.IsAutoComplete() && quest.IsRepeatable() && !quest.IsDailyOrWeekly() && !quest.IsMonthly();
                     text.QuestTitle = quest.LogTitle;
 
                     if (localeConstant != Locale.enUS)