diff --git a/apps/app_queue.c b/apps/app_queue.c
index 6c13ae5005..1138262969 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3110,7 +3110,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 		bridge = ast_bridge_call(qe->chan,peer, &bridge_config);
 
 		if (!attended_transfer_occurred(qe->chan)) {
-			struct ast_datastore *transfer_ds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL);
+			struct ast_datastore *transfer_ds;
 			if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) {
 				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld",
 					qe->chan->exten, qe->chan->context, (long) (callstart - qe->start),
@@ -3149,12 +3149,13 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 							(long)(time(NULL) - callstart),
 							qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
 			}
+			ast_channel_lock(qe->chan);
+			transfer_ds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL);
 			if (transfer_ds) {
-				ast_channel_lock(qe->chan);
 				ast_channel_datastore_remove(qe->chan, transfer_ds);
 				ast_channel_datastore_free(transfer_ds);
-				ast_channel_unlock(qe->chan);
 			}
+			ast_channel_unlock(qe->chan);
 		}
 
 		if (bridge != AST_PBX_NO_HANGUP_PEER)