diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py
index 6e9d15777e..eb48deb128 100644
--- a/direct/src/task/Task.py
+++ b/direct/src/task/Task.py
@@ -770,6 +770,7 @@ class TaskManager:
                 # because finishTask is safe to call twice
                 task.finishTask(self.fVerbose)
                 taskPriList.remove(i)
+                self.__removeTaskFromNameDict(task)
                 # Do not increment the iterator
                 continue
             # Now actually execute the task