diff --git a/drivers/usbdev/cdcecm.c b/drivers/usbdev/cdcecm.c
index 44ca15556fd..6d5693da1d3 100644
--- a/drivers/usbdev/cdcecm.c
+++ b/drivers/usbdev/cdcecm.c
@@ -1887,9 +1887,12 @@ static int cdcecm_setup(FAR struct usbdevclass_driver_s *driver,
       ctrlreq->len   = MIN(len, ret);
       ctrlreq->flags = USBDEV_REQFLAGS_NULLPKT;
 
+#ifndef CONFIG_CDCECM_COMPOSITE
       ret = EP_SUBMIT(dev->ep0, ctrlreq);
       uinfo("EP_SUBMIT ret: %d\n", ret);
-
+#else
+      ret = composite_ep0submit(driver, dev, ctrlreq, ctrl);
+#endif
       if (ret < 0)
         {
           ctrlreq->result = OK;
diff --git a/drivers/usbdev/cdcncm.c b/drivers/usbdev/cdcncm.c
index fe9caddf88c..41c1abadb09 100644
--- a/drivers/usbdev/cdcncm.c
+++ b/drivers/usbdev/cdcncm.c
@@ -2836,8 +2836,12 @@ static int cdcncm_setup(FAR struct usbdevclass_driver_s *driver,
       ctrlreq->len   = MIN(len, ret);
       ctrlreq->flags = USBDEV_REQFLAGS_NULLPKT;
 
+#ifndef CONFIG_CDCNCM_COMPOSITE
       ret = EP_SUBMIT(dev->ep0, ctrlreq);
       uinfo("EP_SUBMIT ret: %d\n", ret);
+#else
+      ret = composite_ep0submit(driver, dev, ctrlreq, ctrl);
+#endif
 
       if (ret < 0)
         {