diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index eca334914f66cc9b797366d3e8602569eb90af1c..889fa7118db530eb09f0f66095456ba3178a67c3 100644
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -530,8 +530,10 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check):
   sshrunner.CopyFileToNode(node, constants.NODED_CERT_FILE)
   sshrunner.CopyFileToNode(node, constants.RAPI_CERT_FILE)
   sshrunner.CopyFileToNode(node, constants.CONFD_HMAC_KEY)
-  mycommand = ("%s start %s -b '%s'" % (constants.DAEMON_UTIL, constants.NODED,
-                                        bind_address))
+  mycommand = ("%s stop-all; %s start %s -b '%s'" % (constants.DAEMON_UTIL,
+                                                     constants.DAEMON_UTIL,
+                                                     constants.NODED,
+                                                     bind_address))
 
   result = sshrunner.Run(node, 'root', mycommand, batch=False,
                          ask_key=ssh_key_check,