diff --git a/config/ejabberd.exs b/config/ejabberd.exs
index 05c2b5d83..21bd0dc1e 100644
--- a/config/ejabberd.exs
+++ b/config/ejabberd.exs
@@ -84,7 +84,7 @@ defmodule Ejabberd.ConfigFile do
 
   module :mod_client_state do
     @opts [
-      drop_chat_states: true,
+      queue_chat_states: true,
       queue_presence: false]
   end
 
diff --git a/config/ejabberd.yml b/config/ejabberd.yml
index 80fc3c622..2a06d74b3 100644
--- a/config/ejabberd.yml
+++ b/config/ejabberd.yml
@@ -560,7 +560,7 @@ modules:
   mod_caps: {}
   mod_carboncopy: {}
   mod_client_state:
-    drop_chat_states: true
+    queue_chat_states: true
     queue_presence: false
   mod_configure: {} # requires mod_adhoc
   mod_disco: {}