diff --git a/src/uct/ib/mlx5/dv/ib_mlx5dv_md.c b/src/uct/ib/mlx5/dv/ib_mlx5dv_md.c
index fde0fe0f5da..84c5bf08d70 100644
--- a/src/uct/ib/mlx5/dv/ib_mlx5dv_md.c
+++ b/src/uct/ib/mlx5/dv/ib_mlx5dv_md.c
@@ -25,6 +25,11 @@
 
 #define UCT_IB_MLX5_MD_DM_ALIGNMENT 64
 
+#define UCT_IB_MLX5_DEVX_ALL_OBJS_MASK \
+    (UCS_BIT(UCT_IB_DEVX_OBJ_RCQP) | UCS_BIT(UCT_IB_DEVX_OBJ_RCSRQ) | \
+     UCS_BIT(UCT_IB_DEVX_OBJ_DCT) | UCS_BIT(UCT_IB_DEVX_OBJ_DCSRQ) | \
+     UCS_BIT(UCT_IB_DEVX_OBJ_DCI) | UCS_BIT(UCT_IB_DEVX_OBJ_CQ))
+
 
 static uint32_t uct_ib_mlx5_flush_rkey_make()
 {
@@ -2582,7 +2587,7 @@ ucs_status_t uct_ib_mlx5_devx_md_open_common(const char *name, size_t size,
 
     devx_objs = md_config->devx_objs;
     if (md_config->devx_objs & UCS_BIT(UCT_IB_DEVX_OBJ_AUTO)) {
-        devx_objs = (odp_version == 1) ? 0 : UCT_IB_MLX5_MD_FLAG_DEVX_OBJS_MASK;
+        devx_objs = (odp_version == 1) ? 0 : UCT_IB_MLX5_DEVX_ALL_OBJS_MASK;
     }
 
     md->flags           |= UCT_IB_MLX5_MD_FLAGS_DEVX_OBJS(devx_objs);
diff --git a/src/uct/ib/mlx5/ib_mlx5.h b/src/uct/ib/mlx5/ib_mlx5.h
index 8c01125db28..783d2b4593e 100644
--- a/src/uct/ib/mlx5/ib_mlx5.h
+++ b/src/uct/ib/mlx5/ib_mlx5.h
@@ -223,11 +223,6 @@ enum {
     UCT_IB_MLX5_MD_FLAG_DEVX_CQ          = UCT_IB_MLX5_MD_FLAG_DEVX_OBJS(CQ),
 };
 
-#define UCT_IB_MLX5_MD_FLAG_DEVX_OBJS_MASK \
-    (UCT_IB_MLX5_MD_FLAG_DEVX_RC_QP | UCT_IB_MLX5_MD_FLAG_DEVX_RC_SRQ | \
-     UCT_IB_MLX5_MD_FLAG_DEVX_DCT | UCT_IB_MLX5_MD_FLAG_DEVX_DC_SRQ | \
-     UCT_IB_MLX5_MD_FLAG_DEVX_DCI | UCT_IB_MLX5_MD_FLAG_DEVX_CQ)
-
 enum {
     UCT_IB_MLX5_SRQ_TOPO_LIST         = 0x0,
     UCT_IB_MLX5_SRQ_TOPO_CYCLIC       = 0x1,