diff --git a/src/device/usbd.c b/src/device/usbd.c
index a0ff96e8..aa81cb11 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -209,10 +209,8 @@ static void usbd_reset(uint8_t rhport)
 /* USB Device Driver task
  * This top level thread manages all device controller event and delegates events to class-specific drivers.
  */
-void usbd_task( void* param)
+void usbd_task (void)
 {
-  (void) param;
-
   // Loop until there is no more events in the queue
   while (1)
   {
diff --git a/src/device/usbd_pvt.h b/src/device/usbd_pvt.h
index 798a871b..d1fccd9e 100644
--- a/src/device/usbd_pvt.h
+++ b/src/device/usbd_pvt.h
@@ -52,7 +52,7 @@ extern tud_desc_set_t const* usbd_desc_set;
 // INTERNAL API for stack management
 //--------------------------------------------------------------------+
 bool usbd_init (void);
-void usbd_task (void* param);
+void usbd_task (void);
 
 
 // Carry out Data and Status stage of control transfer
diff --git a/src/host/usbh.c b/src/host/usbh.c
index 7bcf7aaa..27d32330 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -602,10 +602,8 @@ bool enum_task(hcd_event_t* event)
 /* USB Host Driver task
  * This top level thread manages all host controller event and delegates events to class-specific drivers.
  */
-void usbh_task(void* param)
+void usbh_task(void)
 {
-  (void) param;
-
   // Loop until there is no more events in the queue
   while (1)
   {
diff --git a/src/host/usbh.h b/src/host/usbh.h
index 3656b9a0..8009c508 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -103,7 +103,7 @@ ATTR_WEAK void tuh_umount_cb(uint8_t dev_addr);
 #ifdef _TINY_USB_SOURCE_FILE_
 
 bool usbh_init(void);
-void usbh_task(void* param);
+void usbh_task(void);
 
 bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8_t* data);
 
diff --git a/src/tusb.c b/src/tusb.c
index fd390722..253adc59 100644
--- a/src/tusb.c
+++ b/src/tusb.c
@@ -71,11 +71,11 @@ bool tusb_init(void)
 void tusb_task(void)
 {
   #if TUSB_OPT_HOST_ENABLED
-  usbh_task(NULL);
+  usbh_task();
   #endif
 
   #if TUSB_OPT_DEVICE_ENABLED
-  usbd_task(NULL);
+  usbd_task();
   #endif
 }