diff --git a/saco/game/game.cpp b/saco/game/game.cpp
index 2b2e56b..ea23904 100644
--- a/saco/game/game.cpp
+++ b/saco/game/game.cpp
@@ -848,7 +848,7 @@ void CGame::UpdateCheckpoints()
 		}
 	}
 	else if(m_dwCheckpointMarker) {
-		DisableMarker(m_dwCheckpointMarker);
+		ScriptCommand(&disable_marker, m_dwCheckpointMarker);
 		m_dwCheckpointMarker = NULL;
 	}
 
@@ -868,8 +868,13 @@ void CGame::UpdateCheckpoints()
 		}
 	}
 	else if(m_dwRaceCheckpointMarker) {
-		DisableMarker(m_dwRaceCheckpointMarker);
-		DisableRaceCheckpoint();
+		ScriptCommand(&disable_marker, m_dwRaceCheckpointMarker);
+		if (m_dwRaceCheckpointHandle)
+		{
+			ScriptCommand(&destroy_racing_checkpoint, m_dwRaceCheckpointHandle);
+			m_dwRaceCheckpointHandle = NULL;
+		}
+		m_bRaceCheckpointsEnabled = false;
 		m_dwRaceCheckpointMarker = NULL;
 	}
 }