diff --git a/client/js/lounge.js b/client/js/lounge.js
index a665dca9..5940b2a9 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -420,9 +420,12 @@ $(function() {
 
 		// Remove the date-change marker we put at the top, because it may
 		// not actually be a date change now
-		var firstChild = $(chan).children().eq(0);
-		if (firstChild.attr("class") === "date-marker") {
-			firstChild.remove();
+		var children = $(chan).children();
+		if (children.eq(0).attr("class") === "date-marker") { // Check top most child
+			children.eq(0).remove();
+		} else if (children.eq(0).attr("class") === "unread-marker" && children.eq(1).attr("class") === "date-marker") {
+			// Otherwise the date-marker would get 'stuck' because of the new-massages marker
+			children.eq(1).remove();
 		}
 
 		// get the scrollable wrapper around messages