diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 1fef1401c7..d71f765e73 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -186,6 +186,9 @@ public class Player extends SyncEntity{
 			float angle = Angles.mouseAngle(x, y);
 			this.angle = Mathf.lerpAngDelta(this.angle, angle, 0.1f);
 		}
+
+		x = Mathf.clamp(x, 0, Vars.world.width() * Vars.tilesize);
+		y = Mathf.clamp(y, 0, Vars.world.height() * Vars.tilesize);
 	}
 
 	@Override
diff --git a/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java b/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
index 0cdf6b5148..d15ab91b18 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
@@ -131,6 +131,9 @@ public class EnemyType {
         }else{
             enemy.angle = Mathf.slerp(enemy.angle, enemy.angleTo(enemy.target), turretrotatespeed * Timers.delta());
         }
+
+        enemy.x = Mathf.clamp(enemy.x, 0, Vars.world.width() * Vars.tilesize);
+        enemy.y = Mathf.clamp(enemy.y, 0, Vars.world.height() * Vars.tilesize);
     }
 
     public void move(Enemy enemy){