diff --git a/src/mms/iso_client/iso_client_connection.c b/src/mms/iso_client/iso_client_connection.c
index c4ca6f52..cb58e98f 100644
--- a/src/mms/iso_client/iso_client_connection.c
+++ b/src/mms/iso_client/iso_client_connection.c
@@ -511,18 +511,18 @@ IsoClientConnection_handleConnection(IsoClientConnection self)
                                }
                                else {
 
-                               }
+                                   ByteBuffer_wrap(self->receivePayloadBuffer, self->acseConnection.userDataBuffer,
+                                           self->acseConnection.userDataBufferSize, self->acseConnection.userDataBufferSize);
 
-                           }
+                                   setState(self, STATE_CONNECTED);
+                                   nextState = INT_STATE_WAIT_FOR_DATA_MSG;
 
-                           ByteBuffer_wrap(self->receivePayloadBuffer, self->acseConnection.userDataBuffer,
-                                   self->acseConnection.userDataBufferSize, self->acseConnection.userDataBufferSize);
+                                   if (self->callback(ISO_IND_ASSOCIATION_SUCCESS, self->callbackParameter, self->receivePayloadBuffer) == false) {
+                                       nextState = INT_STATE_CLOSE_ON_ERROR;
+                                   }
 
-                           setState(self, STATE_CONNECTED);
-                           nextState = INT_STATE_WAIT_FOR_DATA_MSG;
+                               }
 
-                           if (self->callback(ISO_IND_ASSOCIATION_SUCCESS, self->callbackParameter, self->receivePayloadBuffer) == false) {
-                               nextState = INT_STATE_CLOSE_ON_ERROR;
                            }
 
                            CotpConnection_resetPayload(self->cotpConnection);