diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1b5464e..25c48ea 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -177,8 +177,6 @@ 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]):
@@ -233,7 +231,9 @@ def devices():
 
                 old_switch = device['switch_hostname'] or "unbekannt"
                 device_name = device['name']
-
+                switch_hostname = request.form.get('switch_hostname')
+                if switch_hostname == "":
+                    switch_hostname = None
                 try:
                     conn.execute("""
                         UPDATE devices