diff --git a/pages/devices/_deviceId/properties.vue b/pages/devices/_deviceId/properties.vue
index 4cdf6557430f74e4c282829e8b97114534c1f3f4..ae4dbe0d2e9f4f74eee28d1d2749e68d2c0490fb 100644
--- a/pages/devices/_deviceId/properties.vue
+++ b/pages/devices/_deviceId/properties.vue
@@ -51,10 +51,10 @@ permissions and limitations under the Licence.
       multiple
     >
       <template
-        v-for="(field, index) in deviceProperties"
+        v-for="(property, index) in deviceProperties"
       >
         <NuxtChild
-          :key="'property-' + index"
+          :key="'property-' + property.id"
           v-model="deviceProperties[index]"
           :compartments="compartments"
           :sampling-medias="samplingMedias"