diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 9f0c26b..52596c4 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -177,6 +177,8 @@ def devices():
             port = request.form.get('port')
             name = request.form.get('name')
             switch_hostname = request.form.get('switch_hostname')
+            if switch_hostname == "":
+                switch_hostname = None
             is_active = 1 if 'is_active' in request.form else 0
 
             if not all([mac, rpi_ip, name]):