diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
index 7d802baf551..b78b7b83a79 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
@@ -868,6 +868,9 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 		if ( adapter == IMemoryBlockRetrieval.class ) {
 			return getDebugTarget().getAdapter( adapter );
 		}
+		if ( adapter == ICDIThread.class ) {
+			return getCDIThread();
+		}
 		return super.getAdapter( adapter );
 	}