diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
index 28642c2760d913a467456ac3f0ed64c12fedd6f5..157c028c6a66ccc751ebaf4f03db5a0ae3a66e00 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -416,12 +416,8 @@ void QmlV8DebuggerClient::messageReceived(const QByteArray &data)
             QString event(value.findChild("event").toVariant().toString());
 
             if (event == "break") {
-                //Check if this break is due to a breakpoint
-                QList<QVariant> breakpoints = value.findChild("body").findChild("breakpoints").toVariant().toList();
-                if (breakpoints.count()) {
-                    d->engine->inferiorSpontaneousStop();
-                    listBreakpoints();
-                }
+                d->engine->inferiorSpontaneousStop();
+                listBreakpoints();
             }
         }
     }
@@ -577,7 +573,6 @@ void QmlV8DebuggerClient::updateBreakpoints(QByteArray &message)
 {
     JsonValue response(message);
 
-    JsonValue refs = response.findChild("refs");
     JsonValue body = response.findChild("body");
 
     QList<JsonValue> breakpoints = body.findChild("breakpoints").children();
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index dc815ee66de6c1f99d3cdc705cde95228266384c..755485200ec860f0a5e10b1b3e2c6d596af1c539 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -218,10 +218,6 @@ void QScriptDebuggerClient::insertBreakpoint(BreakpointModelId id)
     bp.lineNumber = handler->lineNumber(id);
     bp.functionName = handler->functionName(id).toUtf8();
     d->breakpoints.insert(bp);
-
-    if (handler->state(id) == BreakpointInsertProceeding) {
-        handler->notifyBreakpointInsertOk(id);
-    }
 }
 
 void QScriptDebuggerClient::removeBreakpoint(BreakpointModelId id)
@@ -412,6 +408,9 @@ void QScriptDebuggerClient::messageReceived(const QByteArray &data)
             BreakHandler *handler = d->engine->breakHandler();
             foreach (BreakpointModelId id, handler->engineBreakpointIds(d->engine)) {
                 QString processedFilename = handler->fileName(id);
+                QTC_ASSERT(handler->state(id) == BreakpointInsertProceeding,/**/);
+                handler->notifyBreakpointInsertOk(id);
+
                 if (processedFilename == file && handler->lineNumber(id) == line) {
                     QTC_ASSERT(handler->state(id) == BreakpointInserted,/**/);
                     BreakpointResponse br = handler->response(id);