diff --git a/src/common/attributes/useCommonDeviceAttributes.js b/src/common/attributes/useCommonDeviceAttributes.js
index f9214818ff..f81275d46f 100644
--- a/src/common/attributes/useCommonDeviceAttributes.js
+++ b/src/common/attributes/useCommonDeviceAttributes.js
@@ -18,4 +18,12 @@ export default (t) => useMemo(() => ({
     name: t('attributeReportIgnoreOdometer'),
     type: 'boolean',
   },
+  deviceInactivityStart: {
+    name: t('attributeDeviceInactivityStart'),
+    type: 'number',
+  },
+  deviceInactivityPeriod: {
+    name: t('attributeDeviceInactivityPeriod'),
+    type: 'number',
+  },
 }), [t]);
diff --git a/src/common/attributes/useDeviceAttributes.js b/src/common/attributes/useDeviceAttributes.js
index eab9b8f68d..45bcfc80ee 100644
--- a/src/common/attributes/useDeviceAttributes.js
+++ b/src/common/attributes/useDeviceAttributes.js
@@ -22,12 +22,4 @@ export default (t) => useMemo(() => ({
     name: t('sharedTimezone'),
     type: 'string',
   },
-  deviceInactivityStart: {
-    name: t('attributeDeviceInactivityStart'),
-    type: 'number',
-  },
-  deviceInactivityPeriod: {
-    name: t('attributeDeviceInactivityPeriod'),
-    type: 'number',
-  },
 }), [t]);