diff --git a/src/client/graphics/layers/EventsDisplay.ts b/src/client/graphics/layers/EventsDisplay.ts
index 3e88ec39c..70630d894 100644
--- a/src/client/graphics/layers/EventsDisplay.ts
+++ b/src/client/graphics/layers/EventsDisplay.ts
@@ -676,7 +676,8 @@ export class EventsDisplay extends LitElement implements Layer {
                         : event.unitView
                           ? html`<button
                               @click=${() => {
-                                this.emitGoToUnitEvent(event.unitView);
+                                event.unitView &&
+                                  this.emitGoToUnitEvent(event.unitView);
                               }}
                             >
                               ${this.getEventDescription(event)}