diff --git a/core/smpp-extensions/src/main/java/org/restcomm/smpp/DefaultSmppServerHandler.java b/core/smpp-extensions/src/main/java/org/restcomm/smpp/DefaultSmppServerHandler.java
index 8baed10..b89a9fd 100644
--- a/core/smpp-extensions/src/main/java/org/restcomm/smpp/DefaultSmppServerHandler.java
+++ b/core/smpp-extensions/src/main/java/org/restcomm/smpp/DefaultSmppServerHandler.java
@@ -246,6 +246,8 @@ public void sessionDestroyed(SmppSession session) {
 			esmeServer.resetEnquireLinkFail();
 			this.smppServerOpsThread.removeEnquireList(esmeName);
 			this.smppSessionHandlerInterface.destroySmppSessionHandler(esmeServer);
+			//bringing back to close
+			esmeServer.setLocalStateName((com.cloudhopper.smpp.SmppSession.STATES[SmppSession.STATE_CLOSED]));
 			
             DefaultSmppSession defaultSession = (DefaultSmppSession) session;
 
@@ -261,8 +263,6 @@ public void sessionDestroyed(SmppSession session) {
 			// make sure it's really shutdown
 			session.destroy();
 
-			//bringing back to close
-			esmeServer.setLocalStateName((com.cloudhopper.smpp.SmppSession.STATES[SmppSession.STATE_CLOSED]));
 		} finally {
             accessSemaphore.release();
         }