diff --git a/boards/boardctl.c b/boards/boardctl.c
index 279347c088a..f784ceb6f26 100644
--- a/boards/boardctl.c
+++ b/boards/boardctl.c
@@ -133,7 +133,6 @@ static inline int
             case BOARDIOC_USBDEV_CONNECT:    /* Connect the CDC/ACM device */
 #ifndef CONFIG_CDCACM_COMPOSITE
               {
-                DEBUGASSERT(ctrl->handle != NULL);
                 ret = cdcacm_initialize(ctrl->instance, ctrl->handle);
               }
 #endif
@@ -141,8 +140,7 @@ static inline int
 
             case BOARDIOC_USBDEV_DISCONNECT: /* Disconnect the CDC/ACM device */
               {
-                DEBUGASSERT(ctrl->handle != NULL && *ctrl->handle != NULL);
-                cdcacm_uninitialize(*ctrl->handle);
+                ret = cdcacm_uninitialize_instance(ctrl->instance, NULL);
               }
               break;