diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 0e6dc33477e..df09982af9b 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1759,6 +1759,7 @@ void DebuggerPluginPrivate::attachToQmlPort()
     sp.startMode = AttachToRemoteProcess;
     sp.closeMode = KillAtClose;
     sp.languages = QmlLanguage;
+    sp.masterEngineType = QmlEngineType;
 
     //
     // get files from all the projects in the session
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 46b660c5819..e142e7bddc4 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -417,17 +417,21 @@ void QmlEngine::beginConnection(quint16 port)
 
     QTC_ASSERT(state() == EngineRunRequested, return);
 
+    QString host =  startParameters().qmlServerAddress;
+    // Use localhost as default
+    if (host.isEmpty())
+        host = QLatin1String("localhost");
+
     if (port > 0) {
         QTC_ASSERT(startParameters().connParams.port == 0
                    || startParameters().connParams.port == port,
                    qWarning() << "Port " << port << "from application output does not match"
                    << startParameters().connParams.port << "from start parameters.");
-        m_adapter.beginConnectionTcp(startParameters().qmlServerAddress, port);
+        m_adapter.beginConnectionTcp(host, port);
         return;
     }
     // no port from application output, use the one from start parameters ...
-    m_adapter.beginConnectionTcp(startParameters().qmlServerAddress,
-                                 startParameters().qmlServerPort);
+    m_adapter.beginConnectionTcp(host, startParameters().qmlServerPort);
 }
 
 void QmlEngine::connectionStartupFailed()