diff --git a/MotionToPhotonMeter.ino b/MotionToPhotonMeter.ino
index 2e69847d84f3d328dc94ce034697d26f6d994c1f..10044f722bf92959d547fee87d1f67226167fa8f 100644
--- a/MotionToPhotonMeter.ino
+++ b/MotionToPhotonMeter.ino
@@ -44,11 +44,10 @@ MotionToPhotonServer server(result_buffer, result_buffer_length, getPhotoDiodeRe
 TaskHandle_t TaskCore0;
 TaskHandle_t TaskCore1;
 
-void core0( void * pvParameters ){
+void core1( void * pvParameters ){
 	while(true){		
 		if(current_status != Status::Measuring){
 			delay(5); //just small delay
-			esp_task_wdt_reset();
 			continue;
 		}
 		
@@ -79,14 +78,12 @@ void core0( void * pvParameters ){
 					requested_measurements = -1;
 				}
 		}
-		esp_task_wdt_reset();
 	}
 }
 
-void core1( void * pvParameters ){
+void core0( void * pvParameters ){
 	while(true){
 		server.serve();
-		esp_task_wdt_reset();
 	}
 }
 
@@ -104,23 +101,25 @@ void setup() {
 	server.setup();
 
 	esp_task_wdt_init(6000,false);
+	disableCore0WDT();
+	disableCore1WDT();
 	xTaskCreatePinnedToCore(
                     core0,       // Task function.
-                    "Meter",     // name of task.
-                    10000,       // Stack size of task
+                    "Server",     // name of task.
+                    100000,       // Stack size of task
                     NULL,        // parameter of the task
-                    1,           // priority of the task
+                    2,           // priority of the task
                     &TaskCore0,  // Task handle to keep track of created task
                     0);          // pin task to core 0     
 	delay(500);
 	xTaskCreatePinnedToCore(
                     core1,       // Task function.
-                    "Server",    // name of task.
-                    10000,       // Stack size of task
+                    "Meter",    // name of task.
+                    100000,       // Stack size of task
                     NULL,        // parameter of the task
-                    1,           // priority of the task
+                    2,           // priority of the task
                     &TaskCore1,  // Task handle to keep track of created task
-                    0);          // pin task to core 0             
+                    1);          // pin task to core 1             
 	delay(500);
 }