diff --git a/src/Kuzzle.js b/src/Kuzzle.js
index b5b74a9ea..2488dec26 100644
--- a/src/Kuzzle.js
+++ b/src/Kuzzle.js
@@ -117,7 +117,8 @@ function Kuzzle (host, options, cb) {
           var copy;
 
           if (data.type === 'TokenExpired') {
-            return self.unsetJwt();
+            self.unsetJwt();
+            return self.emitEvent('tokenExpired');
           }
 
           if (data.type === 'document') {
@@ -346,6 +347,7 @@ function Kuzzle (host, options, cb) {
 
   this.network.addListener('tokenExpired', function() {
     self.unsetJwt();
+    self.emitEvent('tokenExpired');
   });
 
   if ((options && options.connect || 'auto') === 'auto') {
@@ -486,8 +488,6 @@ Kuzzle.prototype.setJwt = function(token) {
  */
 Kuzzle.prototype.unsetJwt = function() {
   this.jwt = undefined;
-  this.emitEvent('tokenExpired');
-
   return this;
 };
 
diff --git a/src/networkWrapper/protocols/socketio.js b/src/networkWrapper/protocols/socketio.js
index 37fa023d4..04bc9efd7 100644
--- a/src/networkWrapper/protocols/socketio.js
+++ b/src/networkWrapper/protocols/socketio.js
@@ -94,7 +94,7 @@ class SocketIO extends RTWrapper {
    */
   close() {
     this.forceDisconnect = true;
-    this.state = 'disconnected';
+    this.state = 'offline';
     this.socket.close();
     this.socket = null;
   }
diff --git a/src/networkWrapper/protocols/websocket.js b/src/networkWrapper/protocols/websocket.js
index cd1ac02ef..3ffd56f3d 100644
--- a/src/networkWrapper/protocols/websocket.js
+++ b/src/networkWrapper/protocols/websocket.js
@@ -98,7 +98,7 @@ class WSNode extends RTWrapper {
    * Closes the connection
    */
   close () {
-    this.state = 'disconnected';
+    this.state = 'offline';
     this.removeAllListeners();
     this.wasConnected = false;
     if (this.client) {
diff --git a/test/kuzzle/connect.test.js b/test/kuzzle/connect.test.js
index 8a6a86969..bc96e60ed 100644
--- a/test/kuzzle/connect.test.js
+++ b/test/kuzzle/connect.test.js
@@ -101,14 +101,11 @@ describe('Kuzzle connect', function () {
     });
 
     it('should keep a valid JWT at reconnection', function () {
-      var
-        kuzzle = new Kuzzle('somewhereagain', {connect: 'manual'}),
-        eventStub = sinon.stub();
+      var kuzzle = new Kuzzle('somewhereagain', {connect: 'manual'});
 
       kuzzle.checkToken = sinon.stub();
 
       kuzzle.jwt = 'foobar';
-      kuzzle.addListener('tokenExpired', eventStub);
 
       kuzzle.connect();
       clock.tick();
@@ -118,18 +115,15 @@ describe('Kuzzle connect', function () {
       kuzzle.checkToken.yield(null, {valid: true});
 
       should(kuzzle.jwt).be.eql('foobar');
-      should(eventStub).not.be.called();
     });
 
     it('should empty the JWT at reconnection if it has expired', function () {
       var
-        kuzzle = new Kuzzle('somewhereagain', {connect: 'manual'}),
-        eventStub = sinon.stub();
+        kuzzle = new Kuzzle('somewhereagain', {connect: 'manual'});
 
       kuzzle.checkToken = sinon.stub();
 
       kuzzle.jwt = 'foobar';
-      kuzzle.addListener('tokenExpired', eventStub);
 
       kuzzle.connect();
       clock.tick();
@@ -139,7 +133,6 @@ describe('Kuzzle connect', function () {
       kuzzle.checkToken.yield(null, {valid: false});
 
       should(kuzzle.jwt).be.undefined();
-      should(eventStub).be.calledOnce();
     });
 
     it('should register listeners upon receiving a "disconnect" event', function () {
diff --git a/test/kuzzle/methods.test.js b/test/kuzzle/methods.test.js
index 7d1957fdb..5791e7346 100644
--- a/test/kuzzle/methods.test.js
+++ b/test/kuzzle/methods.test.js
@@ -983,14 +983,6 @@ describe('Kuzzle methods', function () {
       kuzzle.unsetJwt();
       should(kuzzle.jwt).be.undefined();
     });
-
-    it('should emit a "tokenExpired" event', function () {
-      var cb = sinon.stub();
-
-      kuzzle.addListener('tokenExpired', cb);
-      kuzzle.unsetJwt();
-      should(cb).be.calledOnce();
-    });
   });
 
   describe('#updateMyCredentials', function() {