diff --git a/features/netsocket/nsapi_dns.cpp b/features/netsocket/nsapi_dns.cpp
index 4412863721..82dd20ccbf 100644
--- a/features/netsocket/nsapi_dns.cpp
+++ b/features/netsocket/nsapi_dns.cpp
@@ -639,6 +639,8 @@ void nsapi_dns_call_in_set(call_in_callback_cb_t callback)
 void nsapi_dns_reset()
 {
     nsapi_dns_cache_reset();
+    dns_message_id = 1;
+    dns_unique_id = 1;
 }
 
 nsapi_error_t nsapi_dns_call_in(call_in_callback_cb_t cb, int delay, mbed::Callback<void()> func)
@@ -843,7 +845,7 @@ static void nsapi_dns_query_async_timeout(void)
     dns_mutex->unlock();
 }
 
-nsapi_error_t nsapi_dns_query_async_cancel(intptr_t id)
+nsapi_error_t nsapi_dns_query_async_cancel(nsapi_size_or_error_t id)
 {
     dns_mutex->lock();
 
diff --git a/features/netsocket/nsapi_dns.h b/features/netsocket/nsapi_dns.h
index 7874d678dd..1870c82f8c 100644
--- a/features/netsocket/nsapi_dns.h
+++ b/features/netsocket/nsapi_dns.h
@@ -216,7 +216,7 @@ nsapi_size_or_error_t nsapi_dns_query_multiple(S *stack, const char *host,
   *  @param id       Unique id of the hostname translation operation
   *  @return         0 on success, negative error code on failure
   */
-nsapi_error_t nsapi_dns_query_async_cancel(nsapi_error_t id);
+nsapi_error_t nsapi_dns_query_async_cancel(nsapi_size_or_error_t id);
 
 /** Set a call in callback
  *