diff --git a/sys/dev/owi/if_owi.c b/sys/dev/owi/if_owi.c
index 3092a61f315..70f1941b323 100644
--- a/sys/dev/owi/if_owi.c
+++ b/sys/dev/owi/if_owi.c
@@ -1901,6 +1901,8 @@ owi_stop(sc)
 
 	WI_LOCK(sc, s);
 
+	untimeout(wi_inquire, sc, sc->wi_stat_ch);
+
 	if (sc->wi_gone) {
 		WI_UNLOCK(sc, s);
 		return;
@@ -1918,8 +1920,6 @@ owi_stop(sc)
 		wi_cmd(sc, WI_CMD_DISABLE|sc->wi_portnum, 0, 0, 0);
 	}
 
-	untimeout(wi_inquire, sc, sc->wi_stat_ch);
-
 	ifp->if_flags &= ~(IFF_RUNNING|IFF_OACTIVE);
 
 	WI_UNLOCK(sc, s);