diff --git a/source/hassio/zwave.markdown b/source/hassio/zwave.markdown
index 949d9ff0bd7..71f91b85327 100644
--- a/source/hassio/zwave.markdown
+++ b/source/hassio/zwave.markdown
@@ -16,7 +16,7 @@ zwave:
   usb_path: /dev/ttyACM0
 ```
 
-### {% linkable_title RAZBERRY BOARD %}
+## {% linkable_title RAZBERRY BOARD %}
 
 If you need GPIO on Raspberry Pi 3 for your Z-Wave module, add the following line into `config.txt` (you have to access that on the SD card directly. Simply plug it into your PC and edit it there. The `config.txt` is not accessible from your Hass.io system, you may need to open the SD card on a Windows or Linux system.):
 
@@ -31,7 +31,7 @@ zwave:
   usb_path: /dev/ttyAMA0
 ```
 
-### {% linkable_title HUSBZB-1 %}
+## {% linkable_title HUSBZB-1 %}
 
 ```yaml
 zwave:
@@ -42,6 +42,18 @@ zha:
   database_path: /config/zigbee.db
 ```
 
+## {% linkable_title Ubuntu and Debian based host system %}
+
+If your instance is running on a Debian based system, e.g., Ubuntu, the ModemManager may cause unexpected issues.
+
+The ModemManager might be claiming or interfering with a USB Z-Wave stick, like the much used Aeotec ones. If you experience issues where the stick stops responding, needs to be re-plugged or Home Assistant needs a restart to get Z-Wave back, chances are high that the ModemManager is causing the issue.
+
+Execute the following command on your host system to disable the ModemManager:
+
+```bash
+systemctl disable ModemManager.service
+```
+
 ### {% linkable_title Finding the path %}
 
 If the above defaults don't work, you can check what hardware has been found using the [`hassio` command](/hassio/commandline/#hardware):