diff --git a/src/driveModi/Modi/Autopilot/autopilot.cpp b/src/driveModi/Modi/Autopilot/autopilot.cpp
index ba46067..e7a1ded 100644
--- a/src/driveModi/Modi/Autopilot/autopilot.cpp
+++ b/src/driveModi/Modi/Autopilot/autopilot.cpp
@@ -48,10 +48,10 @@ void Autopilot::runAutopilot() {
         this->setSelfDriving(ControlPadButton::isControlPadButtonPressed(this->input, ControlPadButton::PadButton::Action));
 
     if (this->routeInfo.currentPoint == this->routeInfo.totalPoints) {
+        this->setSelfDriving(false);
         this->navigationEnded = true;
         this->navigationStarted = false;
         this->selfDrivingAvailable = false;
-        this->setSelfDriving(false);
     }
 
     if (selfDriving) {