diff --git a/src/TargetController/TargetControllerComponent.cpp b/src/TargetController/TargetControllerComponent.cpp
index aa2e05ca..6a4d7baa 100644
--- a/src/TargetController/TargetControllerComponent.cpp
+++ b/src/TargetController/TargetControllerComponent.cpp
@@ -957,8 +957,9 @@ namespace TargetController
 
     void TargetControllerComponent::disableProgrammingMode() {
         if (this->deltaProgrammingSession.has_value()) {
-            this->commitDeltaProgrammingSession(*(this->deltaProgrammingSession));
+            const auto session = std::move(*(this->deltaProgrammingSession));
             this->deltaProgrammingSession = std::nullopt;
+            this->commitDeltaProgrammingSession(session);
         }
 
         Logger::debug("Disabling programming mode");