diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c
index 615dc695fa7..7dff3851883 100644
--- a/sys/dev/mmc/mmc_fdt_helpers.c
+++ b/sys/dev/mmc/mmc_fdt_helpers.c
@@ -381,6 +381,8 @@ mmc_fdt_gpio_teardown(struct mmc_fdt_helper *helper)
 		gpio_pin_release(helper->cd_pin);
 	if (helper->cd_ires != NULL)
 		bus_release_resource(helper->dev, SYS_RES_IRQ, 0, helper->cd_ires);
+
+	taskqueue_drain_timeout(taskqueue_swi_giant, &helper->cd_delayed_task);
 }
 
 bool