diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
index aae82ae7..6d87eb0c 100644
--- a/docs/source/about/advanced_usage.rst
+++ b/docs/source/about/advanced_usage.rst
@@ -712,6 +712,32 @@ keybindings
 `Network <https://localhost:47990/config/#network>`__
 -----------------------------------------------------
 
+`upnp <https://localhost:47990/config/#upnp>`__
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Description**
+   Sunshine will attempt to open ports for streaming over the internet.
+
+**Choices**
+
+.. table::
+   :widths: auto
+
+   =====     ===========
+   Value     Description
+   =====     ===========
+   on        enable UPnP
+   off       disable UPnP
+   =====     ===========
+
+**Default**
+   ``disabled``
+
+**Example**
+   .. code-block:: text
+
+      upnp = on
+
 `address_family <https://localhost:47990/config/#address_family>`__
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -798,32 +824,6 @@ keybindings
 
       origin_web_ui_allowed = lan
 
-`upnp <https://localhost:47990/config/#upnp>`__
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Description**
-   Sunshine will attempt to open ports for streaming over the internet.
-
-**Choices**
-
-.. table::
-   :widths: auto
-
-   =====     ===========
-   Value     Description
-   =====     ===========
-   on        enable UPnP
-   off       disable UPnP
-   =====     ===========
-
-**Default**
-   ``disabled``
-
-**Example**
-   .. code-block:: text
-
-      upnp = on
-
 `external_ip <https://localhost:47990/config/#external_ip>`__
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 85fecacd..315ad75f 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -553,6 +553,16 @@
 
       <!-- Network Tab -->
       <div id="network" v-if="currentTab === 'network'" class="config-page">
+        <!-- UPnP -->
+        <div class="mb-3">
+          <label for="upnp" class="form-label">UPnP</label>
+          <select id="upnp" class="form-select" v-model="config.upnp">
+            <option value="disabled">Disabled</option>
+            <option value="enabled">Enabled</option>
+          </select>
+          <div class="form-text">Automatically configure port forwarding for streaming over the Internet</div>
+        </div>
+
         <!-- Address family -->
         <div class="mb-3">
           <label for="address_family" class="form-label">Address Family</label>
@@ -649,16 +659,6 @@
           </div>
         </div>
 
-        <!-- UPnP -->
-        <div class="mb-3">
-          <label for="upnp" class="form-label">UPnP</label>
-          <select id="upnp" class="form-select" v-model="config.upnp">
-            <option value="disabled">Disabled</option>
-            <option value="enabled">Enabled</option>
-          </select>
-          <div class="form-text">Automatically configure port forwarding</div>
-        </div>
-
         <!-- External IP -->
         <div class="mb-3">
           <label for="external_ip" class="form-label">External IP</label>
@@ -1261,10 +1261,10 @@
             id: "network",
             name: "Network",
             options: {
+              "upnp": "disabled",
               "address_family": "ipv4",
               "port": 47989,
               "origin_web_ui_allowed": "lan",
-              "upnp": "disabled",
               "external_ip": "",
               "lan_encryption_mode": 0,
               "wan_encryption_mode": 1,