diff --git a/LibreMetric.ino b/LibreMetric.ino
index cba4953..4dea677 100644
--- a/LibreMetric.ino
+++ b/LibreMetric.ino
@@ -191,8 +191,8 @@ void GetMessage() {
     for ( uint8_t i = 0; i  <= server.args(); i++ ) {
       String Argument_Name   = server.argName(i);
       String client_response = server.arg(i);
-      if (Argument_Name == "message") message = client_response;
-      if (Argument_Name == "brightness") brightness = client_response.toInt();
+      if (Argument_Name == "message" && client_response != "") message = client_response;
+      if (Argument_Name == "brightness" && client_response != "") brightness = client_response.toInt();
     }
   }
   String webpage = fileRead("/index.html");