diff --git a/app/models/chat.rb b/app/models/chat.rb
index ccc9b47c3..dc2704c97 100644
--- a/app/models/chat.rb
+++ b/app/models/chat.rb
@@ -5,6 +5,7 @@ class Chat < ApplicationModel
   store     :preferences
 
   def customer_state(session_id = nil)
+    return { state: 'chat_disabled' } if !Setting.get('chat')
 
     # reconnect
     if session_id
@@ -62,6 +63,7 @@ class Chat < ApplicationModel
   end
 
   def self.agent_state(user_id)
+    return { state: 'chat_disabled' } if !Setting.get('chat')
     assets = {}
     Chat.where(active: true).each {|chat|
       assets = chat.assets(assets)