diff --git a/src/main/kotlin/org/openbase/planetsudo/level/levelobjects/Agent.kt b/src/main/kotlin/org/openbase/planetsudo/level/levelobjects/Agent.kt
index 894b718..ad0b634 100644
--- a/src/main/kotlin/org/openbase/planetsudo/level/levelobjects/Agent.kt
+++ b/src/main/kotlin/org/openbase/planetsudo/level/levelobjects/Agent.kt
@@ -315,8 +315,8 @@ class Agent(
             // shift
             if (isShifting) {
                 (0..SHIFT_EXTRA_SPEED).forEach { _ ->
-                    if (isCollisionDetected) {
-                        kill()
+                    if (isCollisionDetected) { // Will collide with wall?
+                        return@performAction
                     }
                     if (consumeTonicForShifting()) {
                         // move and apply new direction