diff --git a/apps/app_queue.c b/apps/app_queue.c
index 320f51318c..1c637574a9 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4384,7 +4384,7 @@ static int queue_exec(struct ast_channel *chan, void *data)
 	qe.start = time(NULL);
 
 	/* set the expire time based on the supplied timeout; */
-	if (args.queuetimeoutstr)
+	if (!ast_strlen_zero(args.queuetimeoutstr))
 		qe.expire = qe.start + atoi(args.queuetimeoutstr);
 	else
 		qe.expire = 0;