diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index ff97b153b6f..17455b6708b 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -166,6 +166,12 @@ public:
         connection.connectToHost();
     }
 
+    void stop() override
+    {
+        connection.disconnectFromHost();
+        reportStopped();
+    }
+
     QSsh::SshConnection connection;
 };
 
@@ -1170,8 +1176,11 @@ MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl)
     }
 
     // We need a real address to connect to from the outside.
-    if (device()->type() != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE)
-        addStartDependency(new LocalAddressFinder(runControl, &m_localServerAddress));
+    if (device()->type() != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
+        auto *dependentWorker = new LocalAddressFinder(runControl, &m_localServerAddress);
+        addStartDependency(dependentWorker);
+        addStopDependency(dependentWorker);
+    }
 
     dd->setupRunner(this);
 }