diff --git a/src/client/graphics/layers/StructureIconsLayer.ts b/src/client/graphics/layers/StructureIconsLayer.ts
index a2e41c4fa..df6634461 100644
--- a/src/client/graphics/layers/StructureIconsLayer.ts
+++ b/src/client/graphics/layers/StructureIconsLayer.ts
@@ -277,7 +277,9 @@ export class StructureIconsLayer implements Layer {
 
         if (unit.canUpgrade) {
           this.potentialUpgrade = this.renders.find(
-            (r) => r.unit.id() === unit.canUpgrade,
+            (r) =>
+              r.unit.id() === unit.canUpgrade &&
+              r.unit.owner().id() === this.game.myPlayer()?.id(),
           );
           if (this.potentialUpgrade) {
             this.potentialUpgrade.iconContainer.filters = [