diff --git a/src/runtime_src/core/common/drv/kds_core.c b/src/runtime_src/core/common/drv/kds_core.c
index 10184223e9d..ae8db34524f 100644
--- a/src/runtime_src/core/common/drv/kds_core.c
+++ b/src/runtime_src/core/common/drv/kds_core.c
@@ -621,8 +621,8 @@ kds_submit_ert(struct kds_sched *kds, struct kds_command *xcmd)
 		return -EINVAL;
 	}
 
-	ert->submit(ert, xcmd);
 	set_xcmd_timestamp(xcmd, KDS_QUEUED);
+	ert->submit(ert, xcmd);
 	return 0;
 }
 
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_kds.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_kds.c
index 6c9c8368da1..fa20bb756d1 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_kds.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_kds.c
@@ -2259,6 +2259,8 @@ static int xocl_kds_update_xgq(struct xocl_dev *xdev, int slot_hdl,
 		XDEV(xdev)->kds.ert_disable = true;
 		goto create_regular_cu;
 	}
+	else
+		XDEV(xdev)->kds.ert_disable = false;
 
 	// Soft Kernel Info
 	scu_info = kzalloc(MAX_CUS * sizeof(struct xrt_cu_info), GFP_KERNEL);