diff --git a/board/kevin/board.c b/board/kevin/board.c
index 9b594e8e76..53fc52c36f 100644
--- a/board/kevin/board.c
+++ b/board/kevin/board.c
@@ -298,8 +298,23 @@ DECLARE_HOOK(HOOK_CHIPSET_RESUME,
 	     board_spi_enable,
 	     MOTION_SENSE_HOOK_PRIO - 1);
 
+/*
+ * Don't yank our SPI pins until we know HOOK_INIT has completed, since we
+ * do sensor initialization from HOOK_INIT.
+ */
+static int hook_init_done;
+
+static void hook_init_last(void)
+{
+	hook_init_done = 1;
+}
+DECLARE_HOOK(HOOK_INIT, hook_init_last, HOOK_PRIO_LAST + 1);
+
 static void board_spi_disable(void)
 {
+	while (!hook_init_done)
+		msleep(10);
+
 	spi_enable(CONFIG_SPI_ACCEL_PORT, 0);
 }
 DECLARE_HOOK(HOOK_CHIPSET_SUSPEND,