diff --git a/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp
index a00fb0de..cc129ffe 100644
--- a/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp
+++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp
@@ -149,7 +149,7 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
             throw Avr8CommandFailure{"AVR8 Stop target command failed", responseFrame};
         }
 
-        if (this->getExecutionState() == TargetExecutionState::RUNNING) {
+        if (this->cachedExecutionState != TargetExecutionState::STOPPED) {
             this->waitForStoppedEvent();
         }
     }