diff --git a/src/BIMDataMetaBuildingStructure/StoreySelector/StoreySelector.vue b/src/BIMDataMetaBuildingStructure/StoreySelector/StoreySelector.vue
index 701d504..b990352 100644
--- a/src/BIMDataMetaBuildingStructure/StoreySelector/StoreySelector.vue
+++ b/src/BIMDataMetaBuildingStructure/StoreySelector/StoreySelector.vue
@@ -5,7 +5,7 @@
     :list="storeys"
     elementKey="uuid"
     :closeOnElementClick="true"
-    @element-click="selectedStorey = $event"
+    @element-click="$emit('storey-selected', $event)"
   >
     <template #header>
       <BIMDataIconStorey size="xs" />
@@ -57,11 +57,6 @@ watch(
   },
   { immediate: true }
 );
-
-watch(
-  selectedStorey,
-  storey => emit("storey-selected", storey)
-);
 </script>
 
 <style scoped>
diff --git a/src/BIMDataPhotosphereBuilding/StoreySelector/StoreySelector.vue b/src/BIMDataPhotosphereBuilding/StoreySelector/StoreySelector.vue
index 483e457..75e70c6 100644
--- a/src/BIMDataPhotosphereBuilding/StoreySelector/StoreySelector.vue
+++ b/src/BIMDataPhotosphereBuilding/StoreySelector/StoreySelector.vue
@@ -5,7 +5,7 @@
     :list="storeys"
     elementKey="uuid"
     :closeOnElementClick="true"
-    @element-click="selectedStorey = $event"
+    @element-click="$emit('storey-selected', $event)"
   >
     <template #header>
       <BIMDataIconStorey size="xs" />
@@ -54,11 +54,6 @@ watch(
   },
   { immediate: true }
 );
-
-watch(
-  selectedStorey,
-  storey => emit("storey-selected", storey)
-);
 </script>
 
 <style scoped>