diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index 73b0483592..32b308ae9b 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -2382,7 +2382,10 @@ void EditorViewportWidget::SetDefaultCamera()
 //////////////////////////////////////////////////////////////////////////
 AZ::RPI::ViewPtr EditorViewportWidget::GetCurrentAtomView() const
 {
-    auto atomViewportRequests = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
+if (m_renderViewport && m_renderViewport->GetViewportContext())
+{
+    return m_viewportContext->GetDefaultView();
+}
     if (atomViewportRequests)
     {
         const AZ::Name contextName = atomViewportRequests->GetDefaultViewportContextName();