diff --git a/bacnet-stack/demo/whois/main.c b/bacnet-stack/demo/whois/main.c
index 551949ee..5283df86 100644
--- a/bacnet-stack/demo/whois/main.c
+++ b/bacnet-stack/demo/whois/main.c
@@ -86,9 +86,8 @@ void MyRejectHandler(
 static void Init_Service_Handlers(
     void)
 {
-    /* we need to handle who-is
-       to support dynamic device binding to us */
-    apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
+    /* Note: this applications doesn't need to handle who-is 
+        it is confusing for the user! */
     /* set the handler for all the services we don't implement
        It is required to send the proper reject message... */
     apdu_set_unrecognized_service_handler_handler