diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
index 6483999ce2..f20bf7de2d 100644
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -392,12 +392,12 @@ if(CONFIG_BT_ENABLED)
                     "esp_ble_mesh/mesh_core/settings.c"
                     "esp_ble_mesh/mesh_core/test.c"
                     "esp_ble_mesh/mesh_core/transport.c"
+                    "esp_ble_mesh/mesh_models/common/device_property.c"
                     "esp_ble_mesh/mesh_models/client/client_common.c"
                     "esp_ble_mesh/mesh_models/client/generic_client.c"
                     "esp_ble_mesh/mesh_models/client/lighting_client.c"
                     "esp_ble_mesh/mesh_models/client/sensor_client.c"
                     "esp_ble_mesh/mesh_models/client/time_scene_client.c"
-                    "esp_ble_mesh/mesh_models/server/device_property.c"
                     "esp_ble_mesh/mesh_models/server/generic_server.c"
                     "esp_ble_mesh/mesh_models/server/lighting_server.c"
                     "esp_ble_mesh/mesh_models/server/sensor_server.c"
diff --git a/components/bt/component.mk b/components/bt/component.mk
index 11fb34cbb4..187fc6dfe2 100644
--- a/components/bt/component.mk
+++ b/components/bt/component.mk
@@ -156,6 +156,7 @@ COMPONENT_SRCDIRS += esp_ble_mesh/mesh_common               \
                      esp_ble_mesh/mesh_core                 \
                      esp_ble_mesh/mesh_core/storage         \
                      esp_ble_mesh/btc                       \
+                     esp_ble_mesh/mesh_models/common        \
                      esp_ble_mesh/mesh_models/client        \
                      esp_ble_mesh/mesh_models/server        \
                      esp_ble_mesh/api/core                  \
diff --git a/components/bt/esp_ble_mesh/mesh_models/server/device_property.c b/components/bt/esp_ble_mesh/mesh_models/common/device_property.c
similarity index 100%
rename from components/bt/esp_ble_mesh/mesh_models/server/device_property.c
rename to components/bt/esp_ble_mesh/mesh_models/common/device_property.c
diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/device_property.h b/components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h
similarity index 99%
rename from components/bt/esp_ble_mesh/mesh_models/server/include/device_property.h
rename to components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h
index 35bdc34ef1..df432f5a1a 100644
--- a/components/bt/esp_ble_mesh/mesh_models/server/include/device_property.h
+++ b/components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h
@@ -213,6 +213,7 @@ extern "C" {
 /**
  * @brief BLE Mesh Device Property IDs
  */
+#define BLE_MESH_INVALID_DEVICE_PROPERTY_ID                                 0x0000
 #define BLE_MESH_AVERAGE_AMBIENT_TEMPERATURE_IN_A_PERIOD_OF_DAY             0x0001
 #define BLE_MESH_AVERAGE_INPUT_CURRENT                                      0x0002
 #define BLE_MESH_AVERAGE_INPUT_VOLTAGE                                      0x0003
diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h b/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h
index 08d6437b84..835940307e 100644
--- a/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h
+++ b/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h
@@ -53,8 +53,6 @@ extern "C" {
 #define BLE_MESH_UNKNOWN_REMAIN_TIME            0x3F
 #define BLE_MESH_DEVICE_SPECIFIC_RESOLUTION     10
 
-#define BLE_MESH_INVALID_DEVICE_PROPERTY_ID     0x0000
-
 enum {
     BLE_MESH_TRANS_TIMER_START,  /* Proper transition timer has been started */
     BLE_MESH_TRANS_FLAG_MAX,