diff --git a/src/class/net/net_device.c b/src/class/net/net_device.c
index d0d32e90..7bb11d57 100644
--- a/src/class/net/net_device.c
+++ b/src/class/net/net_device.c
@@ -198,7 +198,17 @@ bool netd_control_request(uint8_t rhport, tusb_control_request_t const * request
   TU_VERIFY (_netd_itf.itf_num == request->wIndex);
 
 #if CFG_TUD_NET == OPT_NET_RNDIS
-  tud_control_xfer(rhport, request, rndis_buf, sizeof(rndis_buf));
+  if (request->bmRequestType_bit.direction == TUSB_DIR_IN)
+  {
+    rndis_generic_msg_t *rndis_msg = (rndis_generic_msg_t *)rndis_buf;
+    uint32_t msglen = tu_le32toh(rndis_msg->MessageLength);
+    TU_ASSERT(msglen <= sizeof(rndis_buf));
+    tud_control_xfer(rhport, request, rndis_buf, msglen);
+  }
+  else
+  {
+    tud_control_xfer(rhport, request, rndis_buf, sizeof(rndis_buf));
+  }
 #else
   (void)rhport;
 #endif