diff --git a/addons/sourcemod/scripting/shavit-replay.sp b/addons/sourcemod/scripting/shavit-replay.sp
index 14c27112..b425b012 100644
--- a/addons/sourcemod/scripting/shavit-replay.sp
+++ b/addons/sourcemod/scripting/shavit-replay.sp
@@ -378,6 +378,11 @@ public int Native_SetReplayData(Handle handler, int numParams)
 	delete frames;
 
 	gI_PlayerFrames[client] = gA_PlayerFrames[client].Length;
+
+	if(gI_PlayerFrames[client] > 0)
+	{
+		gB_Record[client] = true;
+	}
 }
 
 public int Native_GetReplayData(Handle handler, int numParams)