diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py
index 306f0a3c40..a2da07227f 100644
--- a/bitbake/lib/prserv/serv.py
+++ b/bitbake/lib/prserv/serv.py
@@ -442,6 +442,9 @@ class PRServiceConfigError(Exception):
 def auto_start(d):
     global singleton
 
+    # Shutdown any existing PR Server
+    auto_shutdown()
+
     host_params = list(filter(None, (d.getVar('PRSERV_HOST') or '').split(':')))
     if not host_params:
         return None