diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 68d30b84c..4d5d0072c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20110714
+--------
+main/collide.c: When colliding with robot not controlled by us in Multi-Robot game do not apply force or damage - wait until the robot is under our control - preventing juggeling robots back and forth between players and creating massive damage
+
 20110713
 --------
 arch/sdl/event.c, arch/sdl/key.c, main/kconfig.c, main/menu.c: Stability fixes: avoid somfusions with same named variables in one function; Properly sort out players from player list that use too long filenames; Removed call for gr_set_fontcolor in kconfig where no canvas is set, causing crashes when trying to reassign a button, key or axis
diff --git a/main/collide.c b/main/collide.c
index 413658849..6c489ab9e 100644
--- a/main/collide.c
+++ b/main/collide.c
@@ -656,7 +656,10 @@ void collide_robot_and_player( object * robot, object * player, vms_vector *coll
 #ifdef NETWORK
 #ifndef SHAREWARE
 	else
+	{
 		multi_robot_request_change(robot, player->id);
+		return; // only controlling player should make damage otherwise we might juggle robot back and forth, killing it instantly
+	}
 #endif
 #endif