diff --git a/Code/Editor/TrackView/TrackViewPythonFuncs.h b/Code/Editor/TrackView/TrackViewPythonFuncs.h
index 8be1bd140c..6442145ee3 100644
--- a/Code/Editor/TrackView/TrackViewPythonFuncs.h
+++ b/Code/Editor/TrackView/TrackViewPythonFuncs.h
@@ -35,7 +35,7 @@ namespace AzToolsFramework
         : public AZ::Component
         , public EditorLayerTrackViewRequestBus::Handler
     {
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
     AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     public:
         AZ_COMPONENT(TrackViewComponent, "{3CF943CC-6F10-4B19-88FC-CFB697558FFD}")
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
index 3e895465e5..90897090cc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
@@ -70,7 +70,7 @@
 #include <QtWidgets/QMessageBox>
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QFileInfo::d_ptr': class 'QSharedDataPointer<QFileInfoPrivate>' needs to have dll-interface to be used by clients of class 'QFileInfo'
 #include <QDir>
-AZ_POP_DISABLE_OVERRIDE_WARNING
+AZ_POP_DISABLE_WARNING
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp
index 503cbc1d65..58dba5d1dd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp
@@ -50,7 +50,7 @@
 
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 'QFileInfo::d_ptr': class 'QSharedDataPointer<QFileInfoPrivate>' needs to have dll-interface to be used by clients of class 'QFileInfo'
 #include <QFileInfo>
-AZ_POP_DISABLE_OVERRIDE_WARNING
+AZ_POP_DISABLE_WARNING
 #include <QSharedMemory>
 #include <QStandardPaths>
 #include <QtWidgets/QApplication>
diff --git a/Code/Tools/SceneAPI/SceneCore/Containers/Scene.h b/Code/Tools/SceneAPI/SceneCore/Containers/Scene.h
index c96ebd25e1..49320c4592 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Scene.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Scene.h
@@ -63,7 +63,7 @@ namespace AZ
                 SceneGraph m_graph;
                 SceneManifest m_manifest;
                 SceneOrientation m_originalOrientation = SceneOrientation::YUp;
-            AZ_POP_DISABLE_OVERRIDE_WARNING
+            AZ_POP_DISABLE_WARNING
             };
         } // Containers
     } // SceneAPI
diff --git a/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.h b/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.h
index 00df1bca21..4386d4fd8c 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.h
@@ -106,7 +106,7 @@ namespace AZ
             AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
                 StorageLookup m_storageLookup;
                 ValueStorage m_values;
-            AZ_POP_DISABLE_OVERRIDE_WARNING
+            AZ_POP_DISABLE_WARNING
             };
         } // Containers
     } // SceneAPI
diff --git a/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h b/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h
index 24f7243b32..11ba8cd391 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h
@@ -55,7 +55,7 @@ namespace AZ::SceneAPI
             AZ::Transform   m_targetTransform;
             AZ::Transform   m_conversionTransform;
             AZ::Transform   m_conversionTransformInversed;
-            AZ_POP_DISABLE_OVERRIDE_WARNING
+            AZ_POP_DISABLE_WARNING
             AZ::u32         m_targetBasisIndices[3];
             bool            m_needsConversion;
             bool            m_sourceRightHanded;
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp
index 7a84fc3965..a34b42bed8 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp
@@ -14,7 +14,7 @@
 // Disable warnings in moc code
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option")
 #include <Editor/View/Widgets/LoggingPanel/PivotTree/ui_PivotTreeWidget.h>
-AZ_POP_DISABLE_OVERRIDE_WARNING
+AZ_POP_DISABLE_WARNING
 
 namespace ScriptCanvasEditor
 {