diff --git a/src/esp32/WiFiServerAPI.cpp b/src/esp32/WiFiServerAPI.cpp
index 974b0f3c1..109340bff 100644
--- a/src/esp32/WiFiServerAPI.cpp
+++ b/src/esp32/WiFiServerAPI.cpp
@@ -52,6 +52,14 @@ void WiFiServerPort::loop()
 {
     auto client = available();
     if (client) {
-        new WiFiServerAPI(client);
+        // Close any previous connection (see FIXME in header file)
+        if (openAPI)
+            delete openAPI;
+
+        openAPI = new WiFiServerAPI(client);
     }
+
+    if (openAPI)
+        // Allow idle processing so the API can read from its incoming stream
+        openAPI->loop();
 }
\ No newline at end of file
diff --git a/src/esp32/WiFiServerAPI.h b/src/esp32/WiFiServerAPI.h
index dcafa419d..a9b1e39b4 100644
--- a/src/esp32/WiFiServerAPI.h
+++ b/src/esp32/WiFiServerAPI.h
@@ -29,6 +29,13 @@ class WiFiServerAPI : public StreamAPI
  */
 class WiFiServerPort : public WiFiServer
 {
+    /** The currently open port
+     *
+     * FIXME: We currently only allow one open TCP connection at a time, because we depend on the loop() call in this class to
+     * delegate to the worker.  Once coroutines are implemented we can relax this restriction.
+     */
+    WiFiServerAPI *openAPI = NULL;
+
   public:
     WiFiServerPort();