diff --git a/drivers/gpu/nvgpu/common/nvs/nvs_sched_ctrl.c b/drivers/gpu/nvgpu/common/nvs/nvs_sched_ctrl.c
index 399534a50..4287bd6d0 100644
--- a/drivers/gpu/nvgpu/common/nvs/nvs_sched_ctrl.c
+++ b/drivers/gpu/nvgpu/common/nvs/nvs_sched_ctrl.c
@@ -680,13 +680,8 @@ static int nvgpu_nvs_ctrl_fifo_scheduler_process_caps_request(struct gk20a *g,
 
 	(void)g;
 
-	if (request->client_version_major == NVS_DOMAIN_SCHED_VERSION_MAJOR
-			&& request->client_version_minor == NVS_DOMAIN_SCHED_VERSION_MINOR
-			&& request->client_version_patch == NVS_DOMAIN_SCHED_VERSION_PATCH) {
+	if (request->client_version_major == NVS_DOMAIN_SCHED_VERSION_MAJOR) {
 		result = 0;
-		response->sched_version_major = NVS_DOMAIN_SCHED_VERSION_MAJOR;
-		response->sched_version_minor = NVS_DOMAIN_SCHED_VERSION_MINOR;
-		response->sched_version_patch = NVS_DOMAIN_SCHED_VERSION_PATCH;
 		response->client_version_status = NVS_DOMAIN_MSG_CTRL_GET_CAPS_RESP_CLIENT_VERSION_STATUS_OK;
 	} else {
 		result = 1;
@@ -694,6 +689,10 @@ static int nvgpu_nvs_ctrl_fifo_scheduler_process_caps_request(struct gk20a *g,
 			NVS_DOMAIN_MSG_CTRL_GET_CAPS_RESP_CLIENT_VERSION_STATUS_FAILED;
 	}
 
+		response->sched_version_major = NVS_DOMAIN_SCHED_VERSION_MAJOR;
+		response->sched_version_minor = NVS_DOMAIN_SCHED_VERSION_MINOR;
+		response->sched_version_patch = NVS_DOMAIN_SCHED_VERSION_PATCH;
+
 	return result;
 }
 
diff --git a/userspace/units/nvs/nvgpu-nvs.c b/userspace/units/nvs/nvgpu-nvs.c
index f3ad2cfba..47bbef143 100644
--- a/userspace/units/nvs/nvgpu-nvs.c
+++ b/userspace/units/nvs/nvgpu-nvs.c
@@ -189,7 +189,7 @@ static int test_nvs_worker(struct unit_module *m,
 			client_request_caps->client_version_minor = NVS_DOMAIN_SCHED_VERSION_MINOR;
 			client_request_caps->client_version_patch = NVS_DOMAIN_SCHED_VERSION_PATCH;
 			if (error_case) {
-				client_request_caps->client_version_patch = 127U;
+				client_request_caps->client_version_major = 127U;
 			}
 		} else if (message_type == 1) {
 			fifo_msg_type = NVS_DOMAIN_MSG_TYPE_CTRL_SWITCH_DOMAIN;