diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
index ad1c0dca..130eb10b 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
@@ -789,6 +789,14 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
         }
 
         this->programmingModeEnabled = false;
+
+        if (this->configVariant == Avr8ConfigVariant::MEGAJTAG) {
+            this->deactivatePhysical();
+            this->setTargetParameters(this->targetParameters);
+            this->targetAttached = false;
+            this->activate();
+            this->stop();
+        }
     }
 
     std::map<Family, std::map<PhysicalInterface, Avr8ConfigVariant>>