diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 85a2a689..aba9469c 100755
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -530,6 +530,10 @@ namespace TShockAPI
 		public void TempGroupTimerElapsed(object sender, ElapsedEventArgs args)
 		{
 			tempGroup = null;
+			if (sender != null)
+			{
+				((Timer)sender).Stop();
+			}
 		}
 
 		public void SendWorldInfo(int tilex, int tiley, bool fakeid)