diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
index 871d75f194..8a063cd7a7 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
@@ -282,12 +282,14 @@ namespace AZ::AtomBridge
             m_auxGeomPtr = nullptr;
             return;
         }
+        // default instance draws to all viewports in the default scene
         if (m_defaultInstance || !view)
         {
             m_auxGeomPtr = auxGeomFP->GetDrawQueue();
         }
         else
         {
+            // cache the aux geom draw interface for the current view (aka camera)
             m_auxGeomPtr = auxGeomFP->GetOrCreateDrawQueueForView(view);
         }
     }
@@ -297,7 +299,7 @@ namespace AZ::AtomBridge
         AzFramework::DebugDisplayRequestBus::Handler::BusDisconnect(m_viewportId);
         UpdateAuxGeom(scene, viewportContextPtr ? viewportContextPtr->GetDefaultView().get() : nullptr);
         AzFramework::DebugDisplayRequestBus::Handler::BusConnect(m_viewportId);
-        if (!m_defaultInstance)
+        if (!m_defaultInstance) // only the per viewport instances need to listen for viewport changes
         {
             AZ::RPI::ViewportContextIdNotificationBus::Handler::BusConnect(viewportContextPtr->GetId());
         }
@@ -307,13 +309,9 @@ namespace AZ::AtomBridge
     void AtomDebugDisplayViewportInterface::OnViewportDefaultViewChanged(AZ::RPI::ViewPtr view)
     {
         ResetRenderState();
-        if (m_defaultInstance)
-        {
-            RPI::Scene* scene = RPI::RPISystemInterface::Get()->GetDefaultScene().get();
-            UpdateAuxGeom(scene, nullptr);
-        }
-        else
+        if (!m_defaultInstance)
         {
+            // handle viewport update (view change, scene change, etc
             auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
             AZ::RPI::ViewportContextPtr viewportContextPtr = viewportContextManager->GetViewportContextById(m_viewportId);
             UpdateAuxGeom(viewportContextPtr->GetRenderScene().get(), viewportContextPtr->GetDefaultView().get());
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
index 4520b60041..c872e2b81e 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
@@ -263,10 +263,12 @@ namespace AZ::AtomBridge
         RenderState m_rendState;
 
         AZ::RPI::AuxGeomDrawPtr m_auxGeomPtr;
-        bool                    m_defaultInstance = false; // only true for drawing to a particular viewport. What would 2D drawing mean in a scene with several windows?
+
+        // m_defaultInstance is true for the instance that multicasts the debug draws to all viewports
+        // (with an AuxGeom render pass) in the default scene.
+        bool                    m_defaultInstance = false;
         AzFramework::ViewportId m_viewportId = AzFramework::InvalidViewportId; // Address this instance answers on.
-        AZ::RPI::ViewportContext::SceneChangedEvent::Handler
-                                m_sceneChangeHandler;
+        AZ::RPI::ViewportContext::SceneChangedEvent::Handler m_sceneChangeHandler;
     };
 
     // this is duplicated from Cry_Math.h, GetBasisVectors.