diff --git a/docker/classic/run.sh b/docker/classic/run.sh
index 81a15ef2..7012d378 100755
--- a/docker/classic/run.sh
+++ b/docker/classic/run.sh
@@ -5,15 +5,15 @@ set -e
 
 echo "Shairport Sync Startup ($(date))"
 
-if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ]; then
+if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 1 ]; then
   rm -rf /run/dbus/dbus.pid
   rm -rf /run/avahi-daemon/pid
 
   dbus-uuidgen --ensure
   dbus-daemon --system
-fi
 
-[ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ] || avahi-daemon --daemonize --no-chroot
+  avahi-daemon --daemonize --no-chroot
+fi
 
 while [ ! -f /var/run/avahi-daemon/pid ]; do
   echo "Warning: avahi is not running, sleeping for 5 seconds before trying to start shairport-sync"
diff --git a/docker/run.sh b/docker/run.sh
index be53cb73..bb1b1da7 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -5,20 +5,20 @@ set -e
 
 echo "Shairport Sync Startup ($(date))"
 
-if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ]; then
+if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 1 ]; then
   rm -rf /run/dbus/dbus.pid
   rm -rf /run/avahi-daemon/pid
 
   dbus-uuidgen --ensure
   dbus-daemon --system
+
+  avahi-daemon --daemonize --no-chroot
 fi
 
 echo "Starting NQPTP ($(date))"
 
 (/usr/local/bin/nqptp > /dev/null 2>&1) &
 
-[ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ] || avahi-daemon --daemonize --no-chroot
-
 while [ ! -f /var/run/avahi-daemon/pid ]; do
   echo "Warning: avahi is not running, sleeping for 5 seconds before trying to start shairport-sync"
   sleep 5