diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 11cb17b80..8e0b52afc 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -10,6 +10,13 @@ This document lists all the changes for each version. +
 For a list of important changes that require manual actions, please look at release notes.
 
 
+[[v4.0.8]]
+== Version 4.0.8 (under dev)
+
+Bug fixes::
+
+  * core: fix infinite loop in display when the chat area is too small (issue #2053)
+
 [[v4.0.7]]
 == Version 4.0.7 (2023-12-03)
 
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index f045b876d..bac2afc61 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -643,6 +643,8 @@ gui_chat_display_word (struct t_gui_window *window,
                                                               nick_offline);
             }
             ptr_data[pos_saved_char] = saved_char;
+            if (pos_saved_char == 0)
+                break;
             ptr_data += pos_saved_char;
         }
         else
@@ -664,6 +666,8 @@ gui_chat_display_word (struct t_gui_window *window,
                                                               apply_style_inactive,
                                                               nick_offline);
             }
+            if (!ptr_data[0])
+                break;
             ptr_data += strlen (ptr_data);
         }