diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 282c0c31..244d19c5 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -226,13 +226,6 @@ class BaseXMPP(XMLStream):
         - The send queue processor
         - The scheduler
         """
-        if 'xep_0115' in self.plugin:
-            name = 'xep_0115'
-            if not hasattr(self.plugin[name], 'post_inited'):
-                if hasattr(self.plugin[name], 'post_init'):
-                    self.plugin[name].post_init()
-                self.plugin[name].post_inited = True
-
         for name in self.plugin:
             if not hasattr(self.plugin[name], 'post_inited'):
                 if hasattr(self.plugin[name], 'post_init'):
diff --git a/sleekxmpp/plugins/xep_0085/chat_states.py b/sleekxmpp/plugins/xep_0085/chat_states.py
index 17e19d35..17f82afd 100644
--- a/sleekxmpp/plugins/xep_0085/chat_states.py
+++ b/sleekxmpp/plugins/xep_0085/chat_states.py
@@ -52,4 +52,5 @@ class XEP_0085(BasePlugin):
     def _handle_chat_state(self, msg):
         state = msg['chat_state']
         log.debug("Chat State: %s, %s", state, msg['from'].jid)
+        self.xmpp.event('chatstate', msg)
         self.xmpp.event('chatstate_%s' % state, msg)