diff --git a/src/chat/gui.rs b/src/chat/gui.rs
index 632a541..a65b3e4 100644
--- a/src/chat/gui.rs
+++ b/src/chat/gui.rs
@@ -840,7 +840,11 @@ fn setup(_: &Application, ctx: Arc<Context>, ui: UiModel) {
                                 }
                             }
                         });
-                                
+
+                        if ctx.config(|o| !o.new_ui_enabled) {
+                            return;
+                        }
+                        
                         thread::spawn(move || {
                             for message in messages.iter() {
                                 let Some(avatar_url) = grab_avatar(message) else { continue };