diff --git a/source/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs b/source/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs
index 34e8f5c9..36613954 100644
--- a/source/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs
+++ b/source/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs
@@ -3611,6 +3611,11 @@ public bool UpdateDeviceConfiguration(DeviceConfiguration configuration)
                             updateFailed = false;
                         }
                     }
+                    else
+                    {
+                        // failure, bail out
+                        break;
+                    }
                 }
 
                 if(updateFailed)