diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 205cc815..ebd5b5e2 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -729,7 +729,6 @@ void respawnself()
         if(team_isspect(player1->team))
         {
             addmsg(SV_SWITCHTEAM, "ri", m_teammode ? teamatoi(BotManager.GetBotTeam()) : rnd(2));
-            return;
         }
         showscores(false);
         setscope(false);
diff --git a/source/src/main.cpp b/source/src/main.cpp
index afe44a12..0d57c0c6 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -883,7 +883,7 @@ void checkinput()
                 break;
         }
     }
-    mousemove(tdx, tdy);
+    if(tdx || tdy) mousemove(tdx, tdy);
 }
 
 VARF(gamespeed, 10, 100, 1000, if(multiplayer()) gamespeed = 100);