diff --git a/drivers/can/can_mcan.c b/drivers/can/can_mcan.c
index f1526df537c..39d37904936 100644
--- a/drivers/can/can_mcan.c
+++ b/drivers/can/can_mcan.c
@@ -343,11 +343,11 @@ int can_mcan_init(const struct device *dev, const struct can_mcan_config *cfg,
 	}
 #endif
 
+	timing.sjw = cfg->sjw;
 #ifdef CONFIG_CAN_FD_MODE
 	timing_data.sjw = cfg->sjw_data;
 	can_mcan_configure_timing(can, &timing, &timing_data);
 #else
-	timing.sjw = cfg->sjw;
 	can_mcan_configure_timing(can, &timing, NULL);
 #endif