diff --git a/DSL/Resql/users/POST/get-chat-by-id.sql b/DSL/Resql/users/POST/get-chat-by-id.sql
index 2784931bf..8a0aa6370 100644
--- a/DSL/Resql/users/POST/get-chat-by-id.sql
+++ b/DSL/Resql/users/POST/get-chat-by-id.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 csa_title_config AS (
diff --git a/DSL/Resql/users/POST/get-cs-all-ended-chats.sql b/DSL/Resql/users/POST/get-cs-all-ended-chats.sql
index 4e7df0a36..b9d8ec410 100644
--- a/DSL/Resql/users/POST/get-cs-all-ended-chats.sql
+++ b/DSL/Resql/users/POST/get-cs-all-ended-chats.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 MaxChatHistoryComments AS (
diff --git a/DSL/Resql/users/POST/update-test-chat.sql b/DSL/Resql/users/POST/update-test-chat.sql
index f38f3cebc..521e0932c 100644
--- a/DSL/Resql/users/POST/update-test-chat.sql
+++ b/DSL/Resql/users/POST/update-test-chat.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 )
 INSERT INTO chat(base_id, customer_support_id, customer_support_display_name, end_user_id, end_user_first_name,