diff --git a/src/Insight/Insight.cpp b/src/Insight/Insight.cpp
index 30f65c91..e791b35a 100644
--- a/src/Insight/Insight.cpp
+++ b/src/Insight/Insight.cpp
@@ -186,10 +186,6 @@ void Insight::onTargetStateChangedEvent(const Events::TargetStateChanged& event)
         }
     }
 
-    if (event.previousState.executionState == event.newState.executionState) {
-        return;
-    }
-
     emit this->insightSignals->targetStateUpdated(event.newState, event.previousState);
 }
 
diff --git a/src/TargetController/TargetControllerComponent.cpp b/src/TargetController/TargetControllerComponent.cpp
index a67734e3..6a40c859 100644
--- a/src/TargetController/TargetControllerComponent.cpp
+++ b/src/TargetController/TargetControllerComponent.cpp
@@ -1407,6 +1407,11 @@ namespace TargetController
 
     std::unique_ptr<Response> TargetControllerComponent::handleSetProgramCounter(SetTargetProgramCounter& command) {
         this->target->setProgramCounter(command.address);
+
+        auto newState = *(this->targetState);
+        newState.programCounter = this->target->getProgramCounter();
+        this->updateTargetState(newState);
+
         return std::make_unique<Response>();
     }