diff --git a/assets/src/ba_data/python/bastd/game/capturetheflag.py b/assets/src/ba_data/python/bastd/game/capturetheflag.py
index c32526f9..c23a5dd3 100644
--- a/assets/src/ba_data/python/bastd/game/capturetheflag.py
+++ b/assets/src/ba_data/python/bastd/game/capturetheflag.py
@@ -290,6 +290,8 @@ class CaptureTheFlagGame(ba.TeamGameActivity):
             if (not team.gamedata['home_flag_at_base']
                     and flag.held_count == 0):
                 time_out_counting_down = True
+                if flag.time_out_respawn_time is None:
+                    flag.reset_return_times()
                 flag.time_out_respawn_time -= 1
                 if flag.time_out_respawn_time <= 0:
                     flag.handlemessage(ba.DieMessage())