diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java
index 8db4f3b9bf3..a7b671b6182 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java
@@ -1088,8 +1088,9 @@ public abstract class AbstractMIControl extends AbstractDsfService implements IM
 
 				fAccumulatedOOBRecords.add(oob);
 				// limit growth, but only if these are not responses to CLI commands
-				// Bug 302927 & 330608
-				if (fRxCommands.isEmpty() && fAccumulatedOOBRecords.size() > 20) {
+				// Bug 302927 & 330608 & 569911
+				if (fRxCommands.isEmpty() && fAccumulatedOOBRecords.size() > 20
+						|| fAccumulatedOOBRecords.size() > 100000) {
 					fAccumulatedOOBRecords.remove(0);
 				}