diff --git a/Gems/EMotionFX/Code/Include/Integration/ActorComponentBus.h b/Gems/EMotionFX/Code/Include/Integration/ActorComponentBus.h
index c6b18745e6..658f15786f 100644
--- a/Gems/EMotionFX/Code/Include/Integration/ActorComponentBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/ActorComponentBus.h
@@ -95,7 +95,7 @@ namespace EMotionFX
             /// Returns skinning method used by the actor.
             virtual SkinningMethod GetSkinningMethod() const = 0;
 
-            static const size_t s_invalidJointIndex = ~0;
+            static const size_t s_invalidJointIndex = std::numeric_limits<size_t>::max();
         };
 
         using ActorComponentRequestBus = AZ::EBus<ActorComponentRequests>;
diff --git a/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.h
index ac35a6dfcd..6a920fa10d 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.h
@@ -28,7 +28,7 @@ namespace EMotionFX
         Q_OBJECT //AUTOMOC
 
     public:
-        enum
+        enum : uint32
         {
             CLASS_ID = 0x8efd2bee
         };
diff --git a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.h
index f5ef1ffed5..6ea49bf9ef 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.h
@@ -59,7 +59,7 @@ namespace EMotionFX
         static void ResetDisplayedRoundingError();
 
     private:
-        size_t                                              m_id = -1;
+        size_t                                              m_id = std::numeric_limits<size_t>::max();
         bool                                                m_displayMotionSelectionWeight = false;
         const IRandomMotionSelectionDataContainer*          m_dataContainer = nullptr;
         static float                                        s_displayedRoundingError;