diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 9f8ed0dfc6..8ceb8fbff7 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -773,6 +773,9 @@ const ProjectController = {
               })
             }
 
+            const wantsOldChatUI =
+              req.query && req.query.new_chat_ui === 'false'
+
             res.render('project/editor', {
               title: project.name,
               priority_title: true,
@@ -829,7 +832,7 @@ const ProjectController = {
               wsUrl,
               showSupport: Features.hasFeature('support'),
               showNewLogsUI: req.query && req.query.new_logs_ui === 'true',
-              showNewChatUI: req.query && req.query.new_chat_ui === 'true'
+              showNewChatUI: user.betaProgram && !wantsOldChatUI
             })
             timer.done()
           }