diff --git a/IDEHelper/WinDebugger.cpp b/IDEHelper/WinDebugger.cpp
index 9372e78f..1d479f0b 100644
--- a/IDEHelper/WinDebugger.cpp
+++ b/IDEHelper/WinDebugger.cpp
@@ -531,6 +531,7 @@ WinDebugger::WinDebugger(DebugManager* debugManager) : mDbgSymSrv(this)
 	{		
 		mFreeMemoryBreakIndices.push_back(i);
 	}
+	mMemoryBreakpointVersion = 0;
 
 	SYSTEM_INFO systemInfo;
 	GetSystemInfo(&systemInfo);
@@ -621,6 +622,9 @@ void WinDebugger::ThreadRestoreUnpause()
 
 void WinDebugger::UpdateThreadDebugRegisters(WdThreadInfo* threadInfo)
 {	
+	if (threadInfo->mMemoryBreakpointVersion == mMemoryBreakpointVersion)
+		return;
+
 	auto threadId = threadInfo->mHThread;	
 
 	BF_CONTEXT lcContext;
@@ -655,6 +659,7 @@ void WinDebugger::UpdateThreadDebugRegisters(WdThreadInfo* threadInfo)
 	}
 	bool worked = BF_SetThreadContext(threadId, &lcContext) != 0;
 	BF_ASSERT(worked || (mRunState == RunState_Terminating) || (mRunState == RunState_Terminated));
+	threadInfo->mMemoryBreakpointVersion = mMemoryBreakpointVersion;
 }
 
 void WinDebugger::UpdateThreadDebugRegisters()
@@ -3338,6 +3343,7 @@ void WinDebugger::CheckBreakpoint(WdBreakpoint* wdBreakpoint)
 			mMemoryBreakpoints[memoryBreakIdx].mByteCount = wantBytes[i];
 			mMemoryBreakpoints[memoryBreakIdx].mOfs = curOfs;
 			curOfs += wantBytes[i];
+			mMemoryBreakpointVersion++;
 
 			wdBreakpoint->mMemoryBreakpointInfo->mMemoryWatchSlotBitmap |= 1<<memoryBreakIdx;
 		}
@@ -3572,6 +3578,7 @@ void WinDebugger::DeleteBreakpoint(Breakpoint* breakpoint)
 			{
 				mFreeMemoryBreakIndices.push_back(memoryWatchSlot);
 				mMemoryBreakpoints[memoryWatchSlot] = WdMemoryBreakpointBind();
+				mMemoryBreakpointVersion++;
 				UpdateThreadDebugRegisters();
 			}
 		}
@@ -3638,6 +3645,7 @@ void WinDebugger::DetachBreakpoint(Breakpoint* breakpoint)
 			{				
 				mFreeMemoryBreakIndices.push_back(memoryWatchSlot);
 				mMemoryBreakpoints[memoryWatchSlot] = WdMemoryBreakpointBind();
+				mMemoryBreakpointVersion++;
 				UpdateThreadDebugRegisters();
 			}
 		}
diff --git a/IDEHelper/WinDebugger.h b/IDEHelper/WinDebugger.h
index 4d287e9f..9ee575f7 100644
--- a/IDEHelper/WinDebugger.h
+++ b/IDEHelper/WinDebugger.h
@@ -251,6 +251,7 @@ public:
 	addr_target mStoppedAtAddress;
 	addr_target mIsAtBreakpointAddress;
 	addr_target mBreakpointAddressContinuing;
+	int mMemoryBreakpointVersion;
 
 public:
 	WdThreadInfo()
@@ -267,6 +268,7 @@ public:
 		mIsAtBreakpointAddress = 0;
 		mStoppedAtAddress = 0;
 		mBreakpointAddressContinuing = 0;
+		mMemoryBreakpointVersion = 0;
 	}
 };
 
@@ -454,6 +456,7 @@ public:
 	DWORD mDebuggerThreadId;
 	
 	WdMemoryBreakpointBind mMemoryBreakpoints[4];
+	int mMemoryBreakpointVersion;
 	Dictionary<addr_target, int> mPhysBreakpointAddrMap; // To make sure we don't create multiple physical breakpoints at the same addr	
 	Array<WdBreakpoint*> mBreakpoints;	
 	Dictionary<addr_target, WdBreakpoint*> mBreakpointAddrMap;