diff --git a/files/assets/css/chat.css b/files/assets/css/chat.css
index b6a1dfbba..830714236 100644
--- a/files/assets/css/chat.css
+++ b/files/assets/css/chat.css
@@ -121,3 +121,8 @@ lite-youtube {
 .quotes {
 	margin-top: 0.5rem;
 }
+
+.chat-message {
+	max-height: 40px;
+	overflow: scroll;
+}
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 36f45f602..a29b7b406 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -39,7 +39,7 @@
 									</a>
 								</div>
 
-								<span class="chat-message text-black text-break"></span>
+								<div class="chat-message text-black text-break"></div>
 								<span class="text d-none"></span>
 								{% if v.admin_level > 1 %}
 									<i class="btn del fas fa-trash-alt"></i>