diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index 5650f9d57a01..c4146922edc5 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -363,8 +363,14 @@ taskqueue_enqueue_timeout_sbt(struct taskqueue *queue,
 		if (sbt > 0) {
 			if (queue->tq_spin)
 				flags |= C_DIRECT_EXEC;
-			callout_reset_sbt(&timeout_task->c, sbt, pr,
-			    taskqueue_timeout_func, timeout_task, flags);
+			if (queue->tq_spin && queue->tq_tcount == 1 &&
+			    queue->tq_threads[0] == curthread) {
+				callout_reset_sbt_curcpu(&timeout_task->c, sbt, pr,
+				    taskqueue_timeout_func, timeout_task, flags);
+			} else {
+				callout_reset_sbt(&timeout_task->c, sbt, pr,
+				    taskqueue_timeout_func, timeout_task, flags);
+			}
 		}
 		TQ_UNLOCK(queue);
 	}