diff --git a/webapp/src/components/PinInfo.vue b/webapp/src/components/PinInfo.vue
index b79bfc64..a2410325 100644
--- a/webapp/src/components/PinInfo.vue
+++ b/webapp/src/components/PinInfo.vue
@@ -60,6 +60,7 @@ export default defineComponent({
             let selArray: Array<string> = [];
             if (this.selectedPinAssignment) {
                 selArray = Object.keys(this.selectedPinAssignment as Device);
+                selArray = selArray.filter((item) => curArray.includes(item));
             }
 
             let total: Array<string> = [];