diff --git a/Content.Server/Mind/Mind.cs b/Content.Server/Mind/Mind.cs
index c022300b89..4407a1b2cd 100644
--- a/Content.Server/Mind/Mind.cs
+++ b/Content.Server/Mind/Mind.cs
@@ -289,12 +289,12 @@ namespace Content.Server.Mind
         }
 
         /// <summary>
-        /// Removes an objective to this mind.
+        /// Removes an objective from this mind.
         /// </summary>
         /// <returns>Returns true if the removal succeeded.</returns>
         public bool TryRemoveObjective(int index)
         {
-            if (_objectives.Count >= index) return false;
+            if (index < 0 || index >= _objectives.Count) return false;
 
             var objective = _objectives[index];
 
diff --git a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
index a2c7851bb0..d4bdf2fd29 100644
--- a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
+++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
@@ -42,7 +42,7 @@ namespace Content.Server.Objectives.Commands
             }
             for (var i = 0; i < objectives.Count; i++)
             {
-                shell.WriteLine($"- [{i + 1}] {objectives[i].Conditions[0].Title}");
+                shell.WriteLine($"- [{i}] {objectives[i].Conditions[0].Title}");
             }
 
         }