diff --git a/Source/NexusForever.WorldServer/Game/Quest/Quest.cs b/Source/NexusForever.WorldServer/Game/Quest/Quest.cs
index 26ade0ca2..5f3696d97 100644
--- a/Source/NexusForever.WorldServer/Game/Quest/Quest.cs
+++ b/Source/NexusForever.WorldServer/Game/Quest/Quest.cs
@@ -123,6 +123,9 @@ public Quest(Player owner, QuestInfo info)
             for (byte i = 0; i < info.Objectives.Count; i++)
                 objectives.Add(new QuestObjective(info, info.Objectives[i], i));
 
+            if (objectives.Count == 0)
+                state = QuestState.Achieved;
+
             saveMask = QuestSaveMask.Create;
 
             checkState = true;