diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 23ac6b7b1d5..f0c0eb549d3 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -615,7 +615,8 @@ void DebuggerEngine::gotoLocation(const Location &loc)
 {
      d->resetLocation();
 
-    if (debuggerCore()->boolSetting(OperateByInstruction) || !loc.hasDebugInfo()) {
+    if ((hasCapability(OperateByInstructionCapability) &&
+            debuggerCore()->boolSetting(OperateByInstruction)) || !loc.hasDebugInfo()) {
         d->m_disassemblerAgent.setLocation(loc);
         return;
     }