diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index fbbe4752ea..ed8a2155e4 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -76,7 +76,7 @@
         </translation>
     </message>
     <message>
-        <location filename="src/ui/ChatWindow.cpp" line="153"/>
+        <location filename="src/ui/ChatWindow.cpp" line="155"/>
         <source>%1 online now:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index 0ebfb3d4dd..09b50ebf46 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -109,13 +109,15 @@ void ChatWindow::addTimeStamp() {
         }
     }
     timeString.chop(1);
-    QLabel* timeLabel = new QLabel(timeString);
-    timeLabel->setStyleSheet("color: palette(shadow);"
-                             "background-color: palette(highlight);"
-                             "padding: 4px;");
-    timeLabel->setAlignment(Qt::AlignHCenter);
-    ui->messagesFormLayout->addRow(timeLabel);
-    numMessagesAfterLastTimeStamp = 0;
+    if (!timeString.isEmpty()) {
+        QLabel* timeLabel = new QLabel(timeString);
+        timeLabel->setStyleSheet("color: palette(shadow);"
+                                 "background-color: palette(highlight);"
+                                 "padding: 4px;");
+        timeLabel->setAlignment(Qt::AlignHCenter);
+        ui->messagesFormLayout->addRow(timeLabel);
+        numMessagesAfterLastTimeStamp = 0;
+    }
 }
 
 void ChatWindow::startTimerForTimeStamps() {