--- b/sys/dev/usb/controller/xhci.c	
+++ b/sys/dev/usb/controller/xhci.c	
@@ -2326,7 +2326,9 @@ xhci_configure_mask(struct usb_device *udev, uint32_t mask, uint8_t drop)
 		 * context before adding it again:
 		 */
 		xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx0,
-		    mask & XHCI_INCTX_NON_CTRL_MASK);
+		    sc->sc_hw.devs[index].ep_configured &
+		    mask &
+		    XHCI_INCTX_NON_CTRL_MASK);
 
 		/* Add new endpoint context */
 		xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx1, mask);