diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 9da27812..a9811695 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -62,18 +62,19 @@ void prepareHostname(char* hostname)
       hostname[pos] = '-';
       pos++;
     }
-      // else do nothing - no leading hyphens and do not include hyphens for all other characters.
-      pC++;
-    }
-    // if the hostname is left blank, use the mac address/default mdns name
-    if (pos < 6) {
-      sprintf(hostname + 5, "%*s", 6, escapedMac.c_str() + 6);
-    } else { //last character must not be hyphen
-      while (pos > 0 && hostname[pos -1] == '-') {
-        hostname[pos -1] = 0;
-        pos--;
-      }
+    // else do nothing - no leading hyphens and do not include hyphens for all other characters.
+    pC++;
+  }
+  // if the hostname is left blank, use the mac address/default mdns name
+  if (pos < 6) {
+    sprintf(hostname + 5, "%*s", 6, escapedMac.c_str() + 6);
+  } else { //last character must not be hyphen
+    hostname[pos] = '\0'; // terminate string
+    while (pos > 0 && hostname[pos -1] == '-') {
+      hostname[pos -1] = '\0';
+      pos--;
     }
+  }
 }
 
 //handle Ethernet connection event