diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
index e1e87086e7..b5d3f815fe 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
@@ -33,6 +33,7 @@ namespace AZ
                 nativeWindow,
                 &AzFramework::WindowRequestBus::Events::GetClientAreaSize);
             AzFramework::WindowNotificationBus::Handler::BusConnect(nativeWindow);
+            AzFramework::ViewportRequestBus::Handler::BusConnect(id);
 
             m_onProjectionMatrixChangedHandler = ViewportContext::MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix)
             {
@@ -48,6 +49,9 @@ namespace AZ
 
         ViewportContext::~ViewportContext()
         {
+            AzFramework::WindowNotificationBus::Handler::BusDisconnect();
+            AzFramework::ViewportRequestBus::Handler::BusDisconnect();
+
             if (m_currentPipeline)
             {
                 m_currentPipeline->RemoveFromRenderTick();