Index: apps/app_queue.c
===================================================================
--- apps/app_queue.c	(revision 172513)
+++ apps/app_queue.c	(working copy)
@@ -1764,6 +1764,10 @@
 {
 	int res;
 
+	if (ast_strlen_zero(filename)) {
+		return 0;
+	}
+
 	ast_stopstream(chan);
 
 	res = ast_streamfile(chan, filename, chan->language);
@@ -1874,7 +1878,7 @@
 		if (res)
 			goto playout;
 
-		if (avgholdmins > 1) {
+		if (avgholdmins >= 1) {
 			res = ast_say_number(qe->chan, avgholdmins, AST_DIGIT_ANY, qe->chan->language, NULL);
 			if (res)
 				goto playout;
@@ -1899,14 +1903,18 @@
 				goto playout;
 		}
 
+		res = play_file(qe->chan, qe->parent->sound_thanks);
+		if (res) {
+			goto playout;
+		}
 	}
 
 posout:
 	if (qe->parent->announceposition) {
 		ast_verb(3, "Told %s in %s their queue position (which was %d)\n",
 			qe->chan->name, qe->parent->name, qe->pos);
+		res = play_file(qe->chan, qe->parent->sound_thanks);
 	}
-	res = play_file(qe->chan, qe->parent->sound_thanks);
 
 playout:
 	if ((res > 0 && !valid_exit(qe, res)) || res < 0)
Index: configs/queues.conf.sample
===================================================================
--- configs/queues.conf.sample	(revision 172513)
+++ configs/queues.conf.sample	(working copy)
@@ -232,6 +232,13 @@
 ; Use these sound files in making position/holdtime announcements.  The
 ; defaults are as listed below -- change only if you need to.
 ;
+; Keep in mind that you may also prevent a sound from being played if you
+; explicitly set a sound to be an empty string. For example, if you want to
+; prevent the queue from playing queue-thankyou, you may set the sound using
+; the following line:
+;
+; queue-thankyou=
+;
 			;	("You are now first in line.")
 ;queue-youarenext = queue-youarenext		
 			;	("There are")