diff --git a/java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java b/java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java
index 64826e1def..64f44fc4f7 100644
--- a/java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java
+++ b/java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java
@@ -44,6 +44,20 @@ public class NetworkTable implements ITable, IRemote {
     running = true;
   }
 
+  /**
+   * shuts down network tables
+   */
+  public synchronized static void shutdown() {
+    if (!running)
+      throw new IllegalStateException(
+          "Network tables has not yet been initialized");
+    if (client)
+      NetworkTablesJNI.stopClient();
+    else
+      NetworkTablesJNI.stopServer();
+    running = false;
+  }
+
   /**
    * set that network tables should be a server
    * This must be called before initalize or getTable