From 9c23e637a0286533cddcac6a230c53c6c53d6041 Mon Sep 17 00:00:00 2001
From: karlberg <karlberg@amazon.com>
Date: Sat, 8 May 2021 18:24:13 -0700
Subject: [PATCH] Fix for white box test weirdness

---
 .../Visibility/EntityVisibilityBoundsUnionSystem.cpp           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.cpp b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.cpp
index f019039d16..c71adc5c3f 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.cpp
@@ -36,6 +36,9 @@ namespace AzFramework
 
     void EntityVisibilityBoundsUnionSystem::Disconnect()
     {
+        m_entityActivatedEventHandler.Disconnect();
+        m_entityDeactivatedEventHandler.Disconnect();
+
         AZ::TickBus::Handler::BusDisconnect();
         IEntityBoundsUnionRequestBus::Handler::BusDisconnect();
         AZ::Interface<IEntityBoundsUnion>::Unregister(this);