diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index cf76918..4559db0 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -201,10 +201,10 @@ def devices():
             rpi_ip = request.form.get('rpi_ip')
             port = request.form.get('port')
             name = request.form.get('name')
-            switch_hostname = request.form.get('switch_hostname')
+            switch_hostname = request.form.get('switch_hostname') or None
             is_active = 1 if 'is_active' in request.form else 0
 
-            if not all([old_mac, mac, rpi_ip, port, name, switch_hostname]):
+            if not all([old_mac, mac, rpi_ip, port, name]):
                 flash("Alle Felder müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
@@ -223,9 +223,9 @@ def devices():
             try:
                 conn.execute("""
                     UPDATE devices
-                    SET mac=?, rpi_ip=?, port=?, name=?, switch_hostname=?, is_active=?
+                    SET mac=?, rpi_ip=?, port=?, name=?, is_active=?
                     WHERE mac=?
-                """, (mac, rpi_ip, port, name, switch_hostname, is_active, old_mac))
+                """, (mac, rpi_ip, port, name, is_active, old_mac))
                 conn.commit()
                 flash(f"Gerät {name} aktualisiert.")
             except sqlite3.IntegrityError: