diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index 47885032..75601f42 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -129,29 +129,20 @@ static usb_request_handler_fn vendor_request_handler[] = {
 	usb_vendor_request_set_freq_explicit,
 	usb_vendor_request_read_wcid,  // USB_WCID_VENDOR_REQ
 	usb_vendor_request_init_sweep,
-	NULL,
-	NULL,
+	usb_vendor_request_operacake_get_boards,
+	usb_vendor_request_operacake_set_ports,
 	usb_vendor_request_set_hw_sync_mode,
 	usb_vendor_request_reset,
-	NULL,
+	usb_vendor_request_operacake_set_ranges,
 	usb_vendor_request_set_clkout_enable,
 	usb_vendor_request_spiflash_status,
 	usb_vendor_request_spiflash_clear_status,
-	NULL
+	usb_vendor_request_operacake_gpio_test
 };
 
 static const uint32_t vendor_request_handler_count =
 	sizeof(vendor_request_handler) / sizeof(vendor_request_handler[0]);
 
-#ifndef USER_INTERFACE_PORTAPACK
-static void operacake_usb_handlers_init(void) {
-	vendor_request_handler[HACKRF_VENDOR_REQUEST_OPERACAKE_GET_BOARDS] = usb_vendor_request_operacake_get_boards;
-	vendor_request_handler[HACKRF_VENDOR_REQUEST_OPERACAKE_SET_PORTS ] = usb_vendor_request_operacake_set_ports;
-	vendor_request_handler[HACKRF_VENDOR_REQUEST_OPERACAKE_SET_RANGES] = usb_vendor_request_operacake_set_ranges;
-	vendor_request_handler[HACKRF_VENDOR_REQUEST_OPERACAKE_GPIO_TEST ] = usb_vendor_request_operacake_gpio_test;
-}
-#endif
-
 usb_request_status_t usb_vendor_request(
 	usb_endpoint_t* const endpoint,
 	const usb_transfer_stage_t stage
@@ -253,7 +244,6 @@ int main(void) {
 	rf_path_init(&rf_path);
 
 #ifndef USER_INTERFACE_PORTAPACK
-	operacake_usb_handlers_init();
 	operacake_init();
 #endif