diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/Makefile b/features/nanostack/FEATURE_NANOSTACK/coap-service/Makefile
index c808df6170..f104a78110 100644
--- a/features/nanostack/FEATURE_NANOSTACK/coap-service/Makefile
+++ b/features/nanostack/FEATURE_NANOSTACK/coap-service/Makefile
@@ -48,10 +48,7 @@ override CFLAGS += -I$(EVENTLOOP_DIR)/nanostack-event-loop/
 COAPSERVICE_DIR := ../coap-service
 override CFLAGS += -I$(COAPSERVICE_DIR)/coap-service/
 override CFLAGS += -I$(COAPSERVICE_DIR)/source/include/
-
-ifeq (Linux,$(shell uname))
 override CFLAGS += -DHAVE_DEBUG
-endif
 
 LIB = libcoap-service.a
 
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c
index 3d6c91a031..1a28037455 100644
--- a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c
+++ b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c
@@ -46,13 +46,16 @@ static void own_free(void *ptr)
 
 static NS_LIST_DEFINE(request_list, coap_transaction_t, link);
 
-static coap_transaction_t *transaction_find_client_by_token(uint8_t token[4])
+static coap_transaction_t *transaction_find_client_by_token(uint8_t *token, uint8_t token_len, const uint8_t address[static 16], uint16_t port)
 {
+    (void) address;
+    (void) port;
     coap_transaction_t *this = NULL;
+
     ns_list_foreach(coap_transaction_t, cur_ptr, &request_list) {
-        if (memcmp(cur_ptr->token,token,4) == 0 && cur_ptr->client_request) {
+        if ((cur_ptr->token_len == token_len) && (memcmp(cur_ptr->token, token, token_len) == 0) && cur_ptr->client_request) {
            this = cur_ptr;
-            break;
+           break;
         }
     }
     return this;
@@ -147,12 +150,13 @@ static int8_t coap_rx_function(sn_coap_hdr_s *resp_ptr, sn_nsdl_addr_s *address_
     coap_transaction_t *this = NULL;
     (void)address_ptr;
     (void)param;
+
     tr_warn("transaction was not handled %d", resp_ptr->msg_id);
     if (!resp_ptr) {
         return -1;
     }
-    if( resp_ptr->token_ptr ){
-        this = transaction_find_client_by_token(resp_ptr->token_ptr);
+    if(resp_ptr->token_ptr){
+        this = transaction_find_client_by_token(resp_ptr->token_ptr, resp_ptr->token_len, address_ptr->addr_ptr, address_ptr->port);
     }
     if (!this) {
         return 0;
@@ -278,6 +282,7 @@ int16_t coap_message_handler_coap_msg_process(coap_msg_handler_t *handle, int8_t
             memcpy(transaction_ptr->remote_address, source_addr_ptr, 16);
             if (coap_message->token_len) {
                 memcpy(transaction_ptr->token, coap_message->token_ptr, coap_message->token_len);
+                transaction_ptr->token_len = coap_message->token_len;
             }
             transaction_ptr->remote_port = port;
             if (cb(socket_id, coap_message, transaction_ptr) < 0) {
@@ -292,7 +297,7 @@ int16_t coap_message_handler_coap_msg_process(coap_msg_handler_t *handle, int8_t
     } else {
         coap_transaction_t *this = NULL;
         if (coap_message->token_ptr) {
-            this = transaction_find_client_by_token(coap_message->token_ptr);
+            this = transaction_find_client_by_token(coap_message->token_ptr, coap_message->token_len, source_addr_ptr, port);
         }
         if (!this) {
             tr_error("client transaction not found");
@@ -352,8 +357,9 @@ uint16_t coap_message_handler_request_send(coap_msg_handler_t *handle, int8_t se
 
     do{
         randLIB_get_n_bytes_random(token,4);
-    }while(transaction_find_client_by_token(token));
+    }while(transaction_find_client_by_token(token, 4, destination_addr, destination_port));
     memcpy(transaction_ptr->token,token,4);
+    transaction_ptr->token_len = 4;
     request.token_ptr = transaction_ptr->token;
     request.token_len = 4;
 
@@ -464,7 +470,7 @@ int8_t coap_message_handler_response_send_by_msg_id(coap_msg_handler_t *handle,
     response.payload_len = payload_len;
     response.payload_ptr = (uint8_t *) payload_ptr;  // Cast away const and trust that nsdl doesn't modify...
     response.content_format = content_type;
-    response.token_len = 4;
+    response.token_len = transaction_ptr->token_len;
     response.token_ptr = transaction_ptr->token;
     response.msg_code = message_code;
     if (transaction_ptr->req_msg_type == COAP_MSG_TYPE_CONFIRMABLE) {
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_message_handler.h b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_message_handler.h
index a484216900..35c6af129b 100644
--- a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_message_handler.h
+++ b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_message_handler.h
@@ -50,18 +50,19 @@ typedef struct coap_msg_handler_s {
 typedef struct coap_transaction {
     uint8_t remote_address[16];
     uint8_t local_address[16];
-    uint8_t token[4];
+    uint8_t token[8];
     uint32_t create_time;
+    uint8_t *data_ptr;
+    coap_message_handler_response_recv *resp_cb;
     uint16_t remote_port;
     uint16_t msg_id;
     uint16_t data_len;
     int8_t service_id;
     uint8_t options;
-    uint8_t *data_ptr;
+    uint8_t token_len;
     sn_coap_msg_type_e req_msg_type;
     bool client_request: 1;
 
-    coap_message_handler_response_recv *resp_cb;
     ns_list_link_t link;
 } coap_transaction_t;