diff --git a/apps/app_queue.c b/apps/app_queue.c
index 6fe9f6d4a7819760b7469e29a512e5fc2cc22935..9acaa234e0060bd59f4d0453a10b226792fa9a26 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -216,6 +216,7 @@ struct ast_call_queue {
 	
 	int rrpos;			/* Round Robin - position */
 	int wrapped;			/* Round Robin - wrapped around? */
+	int joinempty;			/* Do we care if the queue has no members? */
 
 	struct member *members;		/* Member channels to be tried */
 	struct queue_ent *head;		/* Start of the actual queue */
@@ -280,7 +281,7 @@ static int join_queue(char *queuename, struct queue_ent *qe)
 		if (!strcasecmp(q->name, queuename)) {
 			/* This is our one */
 			ast_mutex_lock(&q->lock);
-			if (q->members && (!q->maxlen || (q->count < q->maxlen))) {
+			if ((q->members || q->joinempty) && (!q->maxlen || (q->count < q->maxlen))) {
 				/* There's space for us, put us at the right position inside
 				 * the queue. 
 				 * Take into account the priority of the calling user */
@@ -1830,6 +1831,8 @@ static void reload_queues(void)
 							ast_log(LOG_WARNING, "'%s' isn't a valid strategy, using ringall instead\n", var->value);
 							q->strategy = 0;
 						}
+					} else if (!strcasecmp(var->name, "joinempty")) {
+						q->joinempty = ast_true(var->value);
 					} else {
 						ast_log(LOG_WARNING, "Unknown keyword in queue '%s': %s at line %d of queue.conf\n", cat, var->name, var->lineno);
 					}
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index 66ed932420af9d1a80a893a609151c8b6ce24b53..ab331e1e871900cddba8f954cc447def0c3bf58e 100755
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -107,6 +107,10 @@
 ;
 ; monitor-join = yes
 ;
+; If you wish to allow queues that have no members currently to be joined, set this to yes
+;
+; joinempty = yes
+;
 ; Each member of this call queue is listed on a separate line in
 ; the form technology/dialstring.  "member" means a normal member of a
 ; queue.  An optional penalty may be specified after a comma, such that