diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index 22ba1fa778f..69b827c9536 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -1785,6 +1785,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 		if (context != null) {
 			if (fBackend == null || !fBackend.supportsDebugContext(context)) {
 				if (fBackend != null) {
+					fBackend.clearDebugContext();
 					fBackend.dispose();
 				}
 				fBackend = (IDisassemblyBackend)context.getAdapter(IDisassemblyBackend.class);