diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 953e21e95..52ef77455 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Reset input delay upon leaving Supermelee (bug #1022) - Alex
 - Properly account for simultaneous destruction of last ships
   in each fleet in Supermelee (bug #437) - Alex
 - Do not match singular stars when given a prefix in star search
diff --git a/sc2/src/uqm/supermelee/melee.c b/sc2/src/uqm/supermelee/melee.c
index 3c8d63149..1ae11f272 100644
--- a/sc2/src/uqm/supermelee/melee.c
+++ b/sc2/src/uqm/supermelee/melee.c
@@ -1453,6 +1453,9 @@ FreeMeleeInfo (MELEE_STATE *pMS)
 
 #ifdef NETPLAY
 	closeAllConnections ();
+	// Clear the input delay in case we will go into the full game later.
+	// Must be done after the net connections are closed.
+	setupInputDelay (0);
 #endif
 }