diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 21907120243..190308e0288 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -177,8 +177,8 @@ void AndroidDebugSupport::start()
     }
     if (isQmlDebugging()) {
         qCDebug(androidDebugSupportLog) << "QML debugging enabled. QML server: "
-                                        << m_runner->qmlServer().toDisplayString();
-        setQmlServer(m_runner->qmlServer());
+                                        << qmlChannel().toDisplayString();
+        setQmlServer(qmlChannel());
         //TODO: Not sure if these are the right paths.
         if (qtVersion)
             addSearchDirectory(qtVersion->qmlPath());
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index e0dc9446d25..94b1551f1fe 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -130,11 +130,10 @@ void AndroidRunner::qmlServerPortReady(Port port)
     emit qmlServerReady(serverUrl);
 }
 
-void AndroidRunner::remoteStarted(const Port &debugServerPort, const QUrl &qmlServer, qint64 pid)
+void AndroidRunner::remoteStarted(const Port &debugServerPort, qint64 pid)
 {
     m_pid = ProcessHandle(pid);
     m_debugServerPort = debugServerPort;
-    m_qmlServer = qmlServer;
     reportStarted();
 }
 
diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h
index 748b3879d00..72c9f3d2045 100644
--- a/src/plugins/android/androidrunner.h
+++ b/src/plugins/android/androidrunner.h
@@ -22,7 +22,6 @@ public:
     explicit AndroidRunner(ProjectExplorer::RunControl *runControl);
 
     Utils::Port debugServerPort() const { return m_debugServerPort; } // GDB or LLDB
-    QUrl qmlServer() const { return m_qmlServer; }
     Utils::ProcessHandle pid() const { return m_pid; }
 
     void start() override;
@@ -36,13 +35,12 @@ signals:
 private:
     void qmlServerPortReady(Utils::Port port);
 
-    void remoteStarted(const Utils::Port &debugServerPort, const QUrl &qmlServer, qint64 pid);
+    void remoteStarted(const Utils::Port &debugServerPort, qint64 pid);
     void remoteFinished(const QString &errString);
     void remoteStdOut(const QString &output);
     void remoteStdErr(const QString &output);
 
     Utils::Port m_debugServerPort;
-    QUrl m_qmlServer;
     Utils::ProcessHandle m_pid;
     QmlDebug::QmlOutputParser m_outputParser;
     Tasking::TaskTreeRunner m_taskTreeRunner;
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index c5e7ece5872..58a8687ae77 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -623,8 +623,8 @@ static ExecutableItem uploadDebugServerRecipe(const Storage<RunnerStorage> &stor
     const auto onTempDebugServerPath = [storage, tempDebugServerPathStorage] {
         const bool tempDirOK = !tempDebugServerPathStorage->isEmpty();
         if (tempDirOK) {
-            storage->m_glue->setStarted(s_localDebugServerPort, storage->m_qmlServer,
-                                        storage->m_processPID);
+            storage->m_glue->runControl()->setQmlChannel(storage->m_qmlServer);
+            storage->m_glue->setStarted(s_localDebugServerPort, storage->m_processPID);
         } else {
             qCDebug(androidRunWorkerLog) << "Can not get temporary file name";
         }
@@ -826,8 +826,8 @@ static ExecutableItem pidRecipe(const Storage<RunnerStorage> &storage)
                 storage->m_processUser = processUser;
                 qCDebug(androidRunWorkerLog) << "Process ID changed to:" << storage->m_processPID;
                 if (!storage->m_useCppDebugger) {
-                    storage->m_glue->setStarted(s_localDebugServerPort, storage->m_qmlServer,
-                                                storage->m_processPID);
+                    storage->m_glue->runControl()->setQmlChannel(storage->m_qmlServer);
+                    storage->m_glue->setStarted(s_localDebugServerPort, storage->m_processPID);
                 }
                 return DoneResult::Success;
             }
@@ -874,10 +874,9 @@ void RunnerInterface::cancel()
     emit canceled();
 }
 
-void RunnerInterface::setStarted(const Utils::Port &debugServerPort, const QUrl &qmlServer,
-                                 qint64 pid)
+void RunnerInterface::setStarted(const Port &debugServerPort, qint64 pid)
 {
-    emit started(debugServerPort, qmlServer, pid);
+    emit started(debugServerPort, pid);
 }
 
 ExecutableItem runnerRecipe(const Storage<RunnerInterface> &glueStorage)
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h
index cdf44c7b0f5..3a9d762ea66 100644
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -34,7 +34,7 @@ public:
     void cancel();
 
     // business logic -> GUI
-    void setStarted(const Utils::Port &debugServerPort, const QUrl &qmlServer, qint64 pid);
+    void setStarted(const Utils::Port &debugServerPort, qint64 pid);
     void setFinished(const QString &errorMessage) { emit finished(errorMessage); }
     void addStdOut(const QString &data) { emit stdOut(data); }
     void addStdErr(const QString &data) { emit stdErr(data); }
@@ -44,7 +44,7 @@ signals:
     void canceled();
 
     // business logic -> GUI
-    void started(const Utils::Port &debugServerPort, const QUrl &qmlServer, qint64 pid);
+    void started(const Utils::Port &debugServerPort, qint64 pid);
     void finished(const QString &errorMessage);
     void stdOut(const QString &data);
     void stdErr(const QString &data);