diff --git a/photon-client/src/store/index.js b/photon-client/src/store/index.js
index 4b52e0ee6..da51e2347 100644
--- a/photon-client/src/store/index.js
+++ b/photon-client/src/store/index.js
@@ -110,6 +110,7 @@ export default new Vuex.Store({
                 staticIp: "",
                 netmask: "",
                 hostname: "photonvision",
+                runNTServer: false,
             },
             lighting: {
                 supported: true,
diff --git a/photon-client/src/views/SettingsViews/Networking.vue b/photon-client/src/views/SettingsViews/Networking.vue
index d92e1059e..4a2cd0875 100644
--- a/photon-client/src/views/SettingsViews/Networking.vue
+++ b/photon-client/src/views/SettingsViews/Networking.vue
@@ -4,6 +4,12 @@
       v-model="settings.teamNumber"
       name="Team Number"
       :rules="[v => (v > 0) || 'Team number must be greater than zero', v => (v < 10000) || 'Team number must have fewer than five digits']"
+      class="mb-4"
+    />
+    <CVSwitch
+      v-model="settings.runNTServer"
+      name="Run NetworkTables Server"
+      tooltip="If enabled, this device will create a NT server. This is useful for home debugging, but should be disabled on-robot."
     />
     <template v-if="$store.state.settings.networkSettings.supported">
       <CVradio
@@ -32,6 +38,7 @@
     import CVnumberinput from '../../components/common/cv-number-input'
     import CVradio from '../../components/common/cv-radio'
     import CVinput from '../../components/common/cv-input'
+    import CVSwitch from "@/components/common/cv-switch";
 
     // https://stackoverflow.com/a/17871737
     const ipv4Regex = /^((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])$/;
@@ -41,6 +48,7 @@
     export default {
         name: 'Networking',
         components: {
+            CVSwitch,
             CVnumberinput,
             CVradio,
             CVinput
diff --git a/photon-server/src/main/java/org/photonvision/common/configuration/NetworkConfig.java b/photon-server/src/main/java/org/photonvision/common/configuration/NetworkConfig.java
index e37f0c779..52dc65bf8 100644
--- a/photon-server/src/main/java/org/photonvision/common/configuration/NetworkConfig.java
+++ b/photon-server/src/main/java/org/photonvision/common/configuration/NetworkConfig.java
@@ -28,6 +28,7 @@ public class NetworkConfig {
     public String staticIp = "";
     public String netmask = "";
     public String hostname = "photonvision";
+    public boolean runNTServer = false;
 
     public boolean shouldManage;
 
@@ -39,12 +40,14 @@ public class NetworkConfig {
             String staticIp,
             String netmask,
             String hostname,
+            boolean runNTServer,
             boolean shouldManage) {
         this.teamNumber = teamNumber;
         this.connectionType = connectionType;
         this.staticIp = staticIp;
         this.netmask = netmask;
         this.hostname = hostname;
+        this.runNTServer = runNTServer;
 
         this.shouldManage = shouldManage || Platform.isRaspberryPi();
     }
@@ -59,6 +62,7 @@ public class NetworkConfig {
         ret.staticIp = (String) map.get("staticIp");
         ret.netmask = (String) map.get("netmask");
         ret.hostname = (String) map.get("hostname");
+        ret.runNTServer = (Boolean) map.get("runNTServer");
         return ret;
     }
 
@@ -70,6 +74,7 @@ public class NetworkConfig {
         tmp.put("staticIp", staticIp);
         tmp.put("netmask", netmask);
         tmp.put("hostname", hostname);
+        tmp.put("runNTServer", runNTServer);
         return tmp;
     }
 }
diff --git a/photon-server/src/main/java/org/photonvision/common/dataflow/networktables/NetworkTablesManager.java b/photon-server/src/main/java/org/photonvision/common/dataflow/networktables/NetworkTablesManager.java
index 4d38a8fa3..993f3cbda 100644
--- a/photon-server/src/main/java/org/photonvision/common/dataflow/networktables/NetworkTablesManager.java
+++ b/photon-server/src/main/java/org/photonvision/common/dataflow/networktables/NetworkTablesManager.java
@@ -69,10 +69,10 @@ public class NetworkTablesManager {
     }
 
     public void setConfig(NetworkConfig config) {
-        if (config.teamNumber > 0) {
-            setClientMode(config.teamNumber);
-        } else {
+        if (config.runNTServer) {
             setServerMode();
+        } else {
+            setClientMode(config.teamNumber);
         }
     }