diff --git a/src/daemon/toks_daemon_release.c b/src/daemon/toks_daemon_release.c
index db05dcc..540b2f2 100644
--- a/src/daemon/toks_daemon_release.c
+++ b/src/daemon/toks_daemon_release.c
@@ -33,7 +33,7 @@ static int32_t toks_daemon_unqueue(struct toks_daemon_ctx * dctx)
 	msg      = &dctx->reply;
 	nwaiters = toks_get_driver_nwaiters(dctx->driver_ctx);
 
-	if (nwaiters == 0)
+	if ((nwaiters == 0) || (dctx->ftokens == 0))
 		return NT_STATUS_SUCCESS;