diff --git a/src/app/debugger/debugger/debugger.js b/src/app/debugger/debugger/debugger.js
index 74273cef34..c56ea05275 100644
--- a/src/app/debugger/debugger/debugger.js
+++ b/src/app/debugger/debugger/debugger.js
@@ -33,8 +33,7 @@ function Debugger (options) {
   this.debugger.setBreakpointManager(this.breakPointManager)
 
   this.executionContext.event.register('contextChanged', this, function (context) {
-    // TODO: was already broken
-    // self.switchProvider(context)
+    self.debugger.switchProvider(context)
   })
 
   this.debugger.event.register('newTraceLoaded', this, function () {