diff --git a/src/queues.c b/src/queues.c
index 2a11d605c1..a87aa2d2a2 100644
--- a/src/queues.c
+++ b/src/queues.c
@@ -439,7 +439,7 @@ static int handle_concrete_asic(struct queue *q,
 	const struct device_info *dev_info = q->dev_info;
 	bool ret;
 
-	if (!dev_info)
+	if (!dev_info || args->queue_type == KFD_IOC_QUEUE_TYPE_SDMA)
 		return HSAKMT_STATUS_SUCCESS;
 
 	if (dev_info->eop_buffer_size > 0) {
@@ -454,9 +454,6 @@ static int handle_concrete_asic(struct queue *q,
 		args->eop_buffer_size = dev_info->eop_buffer_size;
 	}
 
-	if (args->queue_type == KFD_IOC_QUEUE_TYPE_SDMA)
-		return HSAKMT_STATUS_SUCCESS;
-
 	ret = update_ctx_save_restore_size(NodeId, q);
 
 	if (ret) {