diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 23756b0f9036..e727ddda78bf 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1599,6 +1599,9 @@ int spi_setup(struct spi_device *spi)
 	if (!spi->bits_per_word)
 		spi->bits_per_word = 8;
 
+	if (!spi->max_speed_hz)
+		spi->max_speed_hz = spi->master->max_speed_hz;
+
 	if (spi->master->setup)
 		status = spi->master->setup(spi);