diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index d48ba2720530..75d579b22f8a 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -2931,7 +2931,8 @@ xhci_transfer_insert(struct usb_xfer *xfer)

        /* check if bMaxPacketSize changed */
        if (xfer->flags_int.control_xfr != 0 &&
-           pepext->trb_ep_maxp != xfer->endpoint->edesc->wMaxPacketSize[0]) {
+           pepext->trb_ep_maxp != xfer->endpoint->edesc->wMaxPacketSize[0] &&
+           xfer->endpoint->edesc->bEndpointAddress != 0) {

                DPRINTFN(8, "Reconfigure control endpoint\n");

@@ -3937,6 +3938,11 @@ xhci_configure_msg(struct usb_proc_msg *pm)
                pepext = xhci_get_endpoint_ext(xfer->xroot->udev,
                    xfer->endpoint->edesc);

+               if (xfer->endpoint->edesc->bEndpointAddress == 0) {
+                       pepext->trb_running = 1;
+                       pepext->trb_halted = 0;
+               }
+
                if ((pepext->trb_halted != 0) ||
                    (pepext->trb_running == 0)) {