diff --git a/src/zombiereloaded.sp b/src/zombiereloaded.sp
index 0c46161..3443a0d 100644
--- a/src/zombiereloaded.sp
+++ b/src/zombiereloaded.sp
@@ -179,7 +179,6 @@ public OnMapStart()
     ClassOnMapStart();
     OverlaysOnMapStart();
     RoundEndOnMapStart();
-    InfectOnMapStart();
     SEffectsOnMapStart();
     ZSpawnOnMapStart();
     VolInit();
@@ -191,6 +190,7 @@ public OnMapStart()
 public OnMapEnd()
 {
     // Forward event to modules.
+    InfectOnMapEnd();
     VolOnMapEnd();
     VEffectsOnMapEnd();
 }
diff --git a/src/zr/infect.inc b/src/zr/infect.inc
index 80edaf6..e2bf5f1 100644
--- a/src/zr/infect.inc
+++ b/src/zr/infect.inc
@@ -74,14 +74,14 @@ new bool:bZombie[MAXPLAYERS + 1];
 new bool:bInfectImmune[MAXPLAYERS + 1][2];
 
 /**
- * Map is starting.
+ * Map is ending.
  */
-InfectOnMapStart()
+InfectOnMapEnd()
 {
-    // Reset timer handles. Infect timers are invalidated on a map change if
-    // they are still running, so these handles no longer point to valid timers.
-    tInfect = INVALID_HANDLE;
-    tInfectCountdown = INVALID_HANDLE;
+    // Reset timers. Infect timers are invalidated on a map change if they are
+    // still running.
+    ZREndTimer(tInfect);
+    ZREndTimer(tInfectCountdown);
 }
 
 /**