diff --git a/distributions/openhab/src/main/resources/userdata/etc/org.jupnp.cfg b/distributions/openhab/src/main/resources/userdata/etc/org.jupnp.cfg
index dae0b9e9e6..51ebdb9373 100644
--- a/distributions/openhab/src/main/resources/userdata/etc/org.jupnp.cfg
+++ b/distributions/openhab/src/main/resources/userdata/etc/org.jupnp.cfg
@@ -1,3 +1,4 @@
+autoEnable=false
 multicastResponsePort=0
 asyncThreadPoolSize=30
 threadPoolSize=15
diff --git a/launch/app/runtime/services.cfg b/launch/app/runtime/services.cfg
index aed76deaa7..3ae20dd1ce 100644
--- a/launch/app/runtime/services.cfg
+++ b/launch/app/runtime/services.cfg
@@ -26,5 +26,6 @@ startlevel:50=ruleengine:start
 startlevel:70=dsl:sitemap
 startlevel:80=things:handler
 
+org.jupnp:autoEnable=false
 org.jupnp:threadPoolSize=20
 org.ops4j.pax.logging:org.ops4j.pax.logging.log4j2.config.file=../../../../runtime/log4j2.xml