diff --git a/boards/components/src/bus.rs b/boards/components/src/bus.rs
index 8f9f39b5ab..6ddf9dd1cd 100644
--- a/boards/components/src/bus.rs
+++ b/boards/components/src/bus.rs
@@ -62,11 +62,15 @@ macro_rules! spi_bus_component_static {
 
 #[macro_export]
 macro_rules! i2c_master_bus_component_static {
-    () => {{
+    ($D:ty $(,)?) => {{
         let address_buffer = kernel::static_buf!([u8; 1]);
-        let bus = kernel::static_buf!(capsules_extra::bus::I2CMasterBus<'static>);
-        let i2c_device =
-            kernel::static_buf!(capsules_core::virtualizers::virtual_i2c::I2CDevice<'static>);
+        let bus = kernel::static_buf!(capsules_extra::bus::I2CMasterBus<'static, $D>);
+        let i2c_device = kernel::static_buf!(
+            capsules_core::virtualizers::virtual_i2c::I2CDevice<
+                'static,
+                capsules_extra::bus::I2CMasterBus<'static, $D>,
+            >
+        );
 
         (bus, i2c_device, address_buffer)
     };};