diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 4172023..613120d 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -89,11 +89,12 @@
             </div>
             <div class="mb-3">
                 <label>Port</label>
-                <input type="text" name="port" class="form-control" required placeholder="z.B. 3">
+                <input type="text" name="port" class="form-control" placeholder="z.B. 3">
             </div>
             <div class="mb-3">
-                <label>Switch</label>
-                <select name="switch_hostname" class="form-select" required>
+                <label>Switch (optional)</label>
+                <select name="switch_hostname" class="form-select">
+                    <option value="">Kein Switch</option>
                     {% for sw in switches %}
                         <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
                     {% endfor %}
@@ -137,7 +138,7 @@
             </div>
             <div class="mb-3">
                 <label>Port</label>
-                <input type="text" name="port" id="edit_port" class="form-control" required placeholder="z.B. 3">
+                <input type="text" name="port" id="edit_port" class="form-control" placeholder="z.B. 3">
             </div>
         </div>
         <div class="modal-footer">
@@ -161,7 +162,8 @@
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
-            <select name="switch_hostname" id="switch_select" class="form-select" required>
+            <select name="switch_hostname" id="switch_select" class="form-select">
+                <option value="">Kein Switch</option>
                 {% for sw in switches %}
                     <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
                 {% endfor %}