diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go
index 1741e25e..f9cd12a5 100644
--- a/cmd/flamenco-manager/main.go
+++ b/cmd/flamenco-manager/main.go
@@ -148,7 +148,13 @@ func runFlamencoManager() bool {
 		log.Fatal().Err(err).Msg("unable to figure out my own URL")
 	}
 
-	ssdp := makeAutoDiscoverable(urls)
+	// Construct the UPnP/SSDP server.
+	var ssdp *upnp_ssdp.Server
+	if configService.Get().SSDPDiscovery {
+		ssdp = makeAutoDiscoverable(urls)
+	} else {
+		log.Debug().Msg("UPnP/SSDP autodiscovery disabled in configuration")
+	}
 
 	// Construct the services.
 	persist := openDB(*configService)