diff --git a/src/web_server.cpp b/src/web_server.cpp
index 8c4abe1e..b9797c37 100644
--- a/src/web_server.cpp
+++ b/src/web_server.cpp
@@ -649,8 +649,8 @@ void handleLimitGet(MongooseHttpServerRequest *request, MongooseHttpServerRespon
   {
     limit.get().serialize(response);
   } else {
-    response->setCode(404);
-    response->print("{\"msg\":\"no limit\"}");
+    response->setCode(200);
+    response->print("{}");
   }
 }
 
@@ -664,7 +664,7 @@ void handleLimitPost(MongooseHttpServerRequest *request, MongooseHttpServerRespo
       // todo: mqtt_publish_limit();  // update limit props to mqtt
     } else {
       // unused for now
-      response->setCode(500);
+      response->setCode(400);
       response->print("{\"msg\":\"failed to parse JSON\"}");
     }
 }
@@ -675,13 +675,12 @@ void handleLimitDelete(MongooseHttpServerRequest *request, MongooseHttpServerRes
     if (limit.clear()) {
       response->setCode(200);
       response->print("{\"msg\":\"done\"}");
-      // todo: mqtt_publish_limit();  // update limit props to mqtt
     } else {
       response->setCode(500);
       response->print("{\"msg\":\"failed\"}");
     }
   } else {
-    response->setCode(404);
+    response->setCode(200);
     response->print("{\"msg\":\"no limit\"}");
   }
 }
@@ -775,8 +774,8 @@ void handleEmeter(MongooseHttpServerRequest *request)
       manual.getProperties(props);
       props.serialize(response);
     } else {
-    response->setCode(404);
-    response->print("{\"msg\":\"No manual override\"}");
+    response->setCode(200);
+    response->print("{}");
   }
 }
 
@@ -796,7 +795,7 @@ void handleOverridePost(MongooseHttpServerRequest *request, MongooseHttpServerRe
       response->print("{\"msg\":\"Failed to claim manual overide\"}");
     }
   } else {
-    response->setCode(500);
+    response->setCode(400);
     response->print("{\"msg\":\"Failed to parse JSON\"}");
   }
 }
@@ -917,12 +916,12 @@ handleRestart(MongooseHttpServerRequest *request) {
         }
       }
       else {
-        response->setCode(405);
+        response->setCode(400);
         response->print("{\"msg\":\"wrong payload\"}");
         request->send(response);
       }
     } else {
-      response->setCode(405);
+      response->setCode(400);
       response->print("{\"msg\":\"Couldn't parse json\"}");
       request->send(response);
     }