diff --git a/src/network.c b/src/network.c
index d21ff85..6885a7a 100644
--- a/src/network.c
+++ b/src/network.c
@@ -9,7 +9,6 @@
 #include <lwip/api.h>
 
 #include "common.h"
-#include "httpd.h"
 
 /* This task ensures the network connection is up.
  * If the network has not been configured yet,
@@ -55,8 +54,6 @@ void NetworkConnectionTask(void *p) {
             printf("Password: %s\n", apconf.password);
             printf("Channel: %d\n", apconf.channel);
             printf("Authmode: %d\n", apconf.authmode);
-            vTaskDelay(TIME_MS(3000));
-            xTaskCreate(httpd_task, "httpd", 512, NULL, 1, NULL);
             for (;;)
                 vTaskDelay(TIME_MS(5000));
         }
diff --git a/src/wifidmm.c b/src/wifidmm.c
index 190f9dd..0fed86c 100644
--- a/src/wifidmm.c
+++ b/src/wifidmm.c
@@ -9,6 +9,7 @@
 
 #include "common.h"
 #include "network.h"
+#include "httpd.h"
 
 /* This task continuosly listen for incoming data
  * on the UART line, parses the packets and feeds
@@ -48,6 +49,7 @@ void user_init(void) {
     xTaskCreate(NetworkConnectionTask, "NetworkConnection", 512, NULL, 1, NULL);
     xTaskCreate(SerialDataCollectionTask, "SerialDataCollection", 512, NULL, 2, NULL);
     xTaskCreate(MeasurementShippingTask, "MeasurementShipping", 512, NULL, 1, NULL);
+    xTaskCreate(httpd_task, "httpd", 512, NULL, 1, NULL);
 }
 
 /* vim: set et ai ts=4 sw=4: */