diff --git a/network/http-launch/http-launch.c b/network/http-launch/http-launch.c
index 238385ff7b..7b0289056d 100644
--- a/network/http-launch/http-launch.c
+++ b/network/http-launch/http-launch.c
@@ -220,7 +220,11 @@ on_read_bytes (GPollableInputStream * stream, Client * client)
       }
     }
 
-    /* FIXME: If too large, disconnect client */
+    if (client->current_message->len >= 1024 * 1024) {
+      g_print ("No complete request after 1MB of data\n");
+      remove_client (client);
+      return FALSE;
+    }
 
     return TRUE;
   } else {