diff --git a/src/freedombone b/src/freedombone
index aa48376b..dcb68133 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1657,6 +1657,12 @@ function configure_avahi {
       PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}
       sed -i "s|#host-name=.*|host-name=mesh-$PEER_ID|g" /etc/avahi/avahi-daemon.conf
   fi
+
+  # remove an avahi service which isn't used
+  if [ -f /etc/avahi/services/udisks.service ]; then
+	  rm /etc/avahi/services/udisks.service
+  fi
+
   systemctl restart avahi-daemon
   echo 'configure_avahi' >> $COMPLETION_FILE
 }
diff --git a/src/freedombone-client b/src/freedombone-client
index 6fea7630..5ffc8af8 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -213,6 +213,11 @@ function mesh_batman {
   echo '    fi' >> $batman_script
   echo '    sleep 5' >> $batman_script
   echo '' >> $batman_script
+  echo "    # remove an avahi service which isn't used" >> $batman_script
+  echo '    if [ -f /etc/avahi/services/udisks.service ]; then' >> $batman_script
+  echo '        sudo rm /etc/avahi/services/udisks.service' >> $batman_script
+  echo '    fi' >> $batman_script
+  echo '' >> $batman_script
   echo '    # Might have to re-enable wifi' >> $batman_script
   echo '    rfkill unblock $(rfkill list|awk -F: "/phy/ {print $1}") || true' >> $batman_script
   echo '' >> $batman_script