diff --git a/src/matrix/render_functions.cpp b/src/matrix/render_functions.cpp
index 934d571..641adef 100644
--- a/src/matrix/render_functions.cpp
+++ b/src/matrix/render_functions.cpp
@@ -179,58 +179,79 @@ String time_to_string(uint8_t hours, uint8_t minutes)
     // show hours
     switch (hours)
     {
-    case 0:
-        if (minutes >= 0 && minutes < 5)
+        case 0:
         {
-            message += "MITTERNACHT ";
+            if (minutes >= 0 && minutes < 5)
+            {
+                message += "MITTERNACHT ";
+            }
+            else
+            {
+                message += "ZWOLF ";
+            }
+            break;
         }
-        else
+        case 1:
+        {
+            message += "EIN";
+            message += (minutes > 4) ? "S " : " ";  // add "S" if needed
+            break;
+        }
+        case 2:
+        {
+            message += "ZWEI ";
+            break;
+        }
+        case 3:
+        {
+            message += "DREI ";
+            break;
+        }
+        case 4:
+        {
+            message += "VIER ";
+            break;
+        }
+        case 5:
+        {
+            message += "FUNF ";
+            break;
+        }
+        case 6:
+        {
+            message += "SECHS ";
+            break;
+        }
+        case 7:
+        {
+            message += "SIEBEN ";
+            break;
+        }
+        case 8:
+        {
+            message += "ACHT ";
+            break;
+        }
+        case 9:
+        {
+            message += "NEUN ";
+            break;
+        }
+        case 10:
+        {
+            message += "ZEHN ";
+            break;
+        }
+        case 11:
+        {
+            message += "ELF ";
+            break;
+        }
+        case 12:
         {
             message += "ZWOLF ";
+            break;
         }
-        break;
-    case 1:
-        message += "EIN";
-        // EIN(S)
-        if (minutes > 4)
-        {
-            message += "S";
-        }
-        message += " ";
-        break;
-    case 2:
-        message += "ZWEI ";
-        break;
-    case 3:
-        message += "DREI ";
-        break;
-    case 4:
-        message += "VIER ";
-        break;
-    case 5:
-        message += "FUNF ";
-        break;
-    case 6:
-        message += "SECHS ";
-        break;
-    case 7:
-        message += "SIEBEN ";
-        break;
-    case 8:
-        message += "ACHT ";
-        break;
-    case 9:
-        message += "NEUN ";
-        break;
-    case 10:
-        message += "ZEHN ";
-        break;
-    case 11:
-        message += "ELF ";
-        break;
-    case 12:
-        message += "ZWOLF ";
-        break;
     }
     if ((minutes < 5) && (hours != 0))
     {