diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-5.png b/core/assets-raw/sprites/blocks/environment/dark-panel-5.png
index 3a0ac2b391..2e990695ed 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-5.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-5.png differ
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 991f48124b..f1762ad3fe 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -390,7 +390,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             player.clearUnit();
             //make sure it's AI controlled, so players can't overwrite each other
         }else if(unit.isAI() && unit.team == player.team() && !unit.dead){
-            if(net.client()){
+            if(net.client() && player.isLocal()){
                 player.justSwitchFrom = player.unit();
                 player.justSwitchTo = unit;
             }
@@ -467,7 +467,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
         //only reset the controlled type and control a unit after the timer runs out
         //essentially, this means the client waits for 1 second after controlling something before trying to control something else automatically
-        if(!player.dead() && (recentRespawnTimer -= Time.delta / 60f) <= 0f){
+        if(!player.dead() && (recentRespawnTimer -= Time.delta / 60f) <= 0f && player.justSwitchFrom != player.unit()){
             controlledType = player.unit().type;
         }