diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
index 76dfcaf8dbf..e7af790fdaf 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
@@ -131,7 +131,9 @@ public class Target  implements ICDITarget {
 			// To generate changeEvents.
 			if (doUpdate) {
 				RegisterManager regMgr = (RegisterManager)session.getRegisterManager();
-				regMgr.update();
+				if (regMgr.isAutoUpdate()) {
+					regMgr.update();
+				}
 			}
 		}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java
index f67fcd120f3..60be0fdcf01 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java
@@ -223,7 +223,9 @@ public class Thread extends CObject implements ICDIThread {
 			// To generate changeEvents.
 			if (doUpdate) {
 				RegisterManager regMgr = (RegisterManager)session.getRegisterManager();
-				regMgr.update();
+				if (regMgr.isAutoUpdate()) {
+					regMgr.update();
+				}
 			}
 		} catch (MIException e) {
 			throw new MI2CDIException(e);