diff --git a/src/service.c b/src/service.c
index ac27ed5d..a7b39cd1 100644
--- a/src/service.c
+++ b/src/service.c
@@ -429,8 +429,9 @@ static int service_stop(svc_t *svc)
 		if (do_progress)
 			print_result(0);
 		return 0;
-	}
+	} else
 #endif
+	service_timeout_cancel(svc);
 
 	if (svc->pid <= 1) {
 		_d("Bad PID %d for %s, SIGTERM", svc->pid, svc->cmd);