diff --git a/Gems/AudioEngineWwise/Code/CMakeLists.txt b/Gems/AudioEngineWwise/Code/CMakeLists.txt
index 98a31fb91a..33c80bc31c 100644
--- a/Gems/AudioEngineWwise/Code/CMakeLists.txt
+++ b/Gems/AudioEngineWwise/Code/CMakeLists.txt
@@ -18,31 +18,18 @@ set(AUDIOENGINEWWISE_COMPILEDEFINITIONS
 find_package(Wwise MODULE)
 
 ################################################################################
-# Server / Unsupported
+# Servers
+# (and situations where Wwise SDK is not found or otherwise unavailable)
 ################################################################################
-if (PAL_TRAIT_BUILD_SERVER_SUPPORTED OR PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB OR NOT Wwise_FOUND)
-    # Stub gem for server and unsupported platforms. Audio Engine Wwise is client only
-    ly_add_target(
-        NAME AudioEngineWwise.Stub ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
-        NAMESPACE Gem
-        FILES_CMAKE
-            audioenginewwise_stub_files.cmake
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzCore
-    )
-endif()
-
-if (PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB OR NOT Wwise_FOUND)
-    # setup aliases so stubs will be used if something references AudioEngineWwise(.Editor)
-    add_library(Gem::AudioEngineWwise ALIAS AudioEngineWwise.Stub)
-    add_library(Gem::AudioEngineWwise.Editor ALIAS AudioEngineWwise.Stub)
+if(NOT PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED OR NOT Wwise_FOUND)
+    # Don't create any Gem targets and aliases.  Nothing should depend on this
+    # Gem directly, because if it doesn't define targets it will cause an error.
     return()
 endif()
 
 
 ################################################################################
-# Runtime / Game
+# Clients
 ################################################################################
 ly_add_target(
     NAME AudioEngineWwise.Static STATIC
@@ -181,7 +168,7 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
 endif()
 
 ################################################################################
-# Tools / Editor
+# Tools / Builders
 ################################################################################
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
diff --git a/Gems/AudioEngineWwise/Code/Platform/Android/PAL_android.cmake b/Gems/AudioEngineWwise/Code/Platform/Android/PAL_android.cmake
index e3729baea7..c706c464d3 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/PAL_android.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/PAL_android.cmake
@@ -6,4 +6,4 @@
 #
 #
 
-set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE)
+set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)
diff --git a/Gems/AudioEngineWwise/Code/Platform/Linux/PAL_linux.cmake b/Gems/AudioEngineWwise/Code/Platform/Linux/PAL_linux.cmake
index e3729baea7..c706c464d3 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Linux/PAL_linux.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Linux/PAL_linux.cmake
@@ -6,4 +6,4 @@
 #
 #
 
-set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE)
+set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)
diff --git a/Gems/AudioEngineWwise/Code/Platform/Mac/PAL_mac.cmake b/Gems/AudioEngineWwise/Code/Platform/Mac/PAL_mac.cmake
index e3729baea7..c706c464d3 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Mac/PAL_mac.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Mac/PAL_mac.cmake
@@ -6,4 +6,4 @@
 #
 #
 
-set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE)
+set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)
diff --git a/Gems/AudioEngineWwise/Code/Platform/Windows/PAL_windows.cmake b/Gems/AudioEngineWwise/Code/Platform/Windows/PAL_windows.cmake
index e3729baea7..c706c464d3 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/PAL_windows.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/PAL_windows.cmake
@@ -6,4 +6,4 @@
 #
 #
 
-set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE)
+set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)
diff --git a/Gems/AudioEngineWwise/Code/Platform/iOS/PAL_ios.cmake b/Gems/AudioEngineWwise/Code/Platform/iOS/PAL_ios.cmake
index e3729baea7..c706c464d3 100644
--- a/Gems/AudioEngineWwise/Code/Platform/iOS/PAL_ios.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/iOS/PAL_ios.cmake
@@ -6,4 +6,4 @@
 #
 #
 
-set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE)
+set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)
diff --git a/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule_Stub.cpp b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule_Stub.cpp
deleted file mode 100644
index 4344eb6072..0000000000
--- a/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule_Stub.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Module/Module.h>
-
-AZ_DECLARE_MODULE_CLASS(Gem_AudioEngineWwise, AZ::Module)
diff --git a/Gems/AudioEngineWwise/Code/audioenginewwise_stub_files.cmake b/Gems/AudioEngineWwise/Code/audioenginewwise_stub_files.cmake
deleted file mode 100644
index 5597c28d04..0000000000
--- a/Gems/AudioEngineWwise/Code/audioenginewwise_stub_files.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Source/AudioEngineWwiseModule_Stub.cpp
-)