diff --git a/src/server/api/general.js b/src/server/api/general.js
index d3f1a7cca4acb89c61d604fad945923f0f55299a..5ae7bdd55cbe732e7b1f3641cfeb868f355ff7c7 100644
--- a/src/server/api/general.js
+++ b/src/server/api/general.js
@@ -162,8 +162,8 @@ export default function useGeneralApi(app) {
             };
 
             // Add auth token for chat to response.
-            if (config.get('openhive_chat_iframe_integration_enable')) {
-                let result = {};
+            if (config.get('openhive_chat_iframe_integration_enable') === 'yes') {
+                    let result = {};
                 if (ctx.session.a) {
                     result = await getChatAuthToken(ctx.session.a);
                 } else if (ctx.session.externalUser && ctx.session.externalUser.system === 'hivesigner') {
diff --git a/src/server/server.js b/src/server/server.js
index 4eca6ccca9b93cbda8725ab76de26b4ba91d2d16..e8d29a8117ccfe34e08378a170681ae164571427 100644
--- a/src/server/server.js
+++ b/src/server/server.js
@@ -108,8 +108,8 @@ useGeneralApi(app);
 if (config.get('oauth_server') && (config.get('oauth_server')).enable === 'yes') {
     oauthServer(app);
 }
-if (config.get('openhive_chat_iframe_integration_enable')) {
-    useRocketChat(app);
+if (config.get('openhive_chat_iframe_integration_enable') === 'yes') {
+        useRocketChat(app);
 }
 useRedirects(app);
 useUserJson(app);