diff --git a/Gems/EMotionFX/Code/MCore/Source/IDGenerator.cpp b/Gems/EMotionFX/Code/MCore/Source/IDGenerator.cpp
index 33dcf1e74d..7e4ff9b16e 100644
--- a/Gems/EMotionFX/Code/MCore/Source/IDGenerator.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/IDGenerator.cpp
@@ -15,8 +15,8 @@ namespace MCore
 {
     // constructor
     IDGenerator::IDGenerator()
+        : mNextID{0}
     {
-        mNextID.SetValue(0);
     }
 
 
@@ -27,10 +27,10 @@ namespace MCore
 
 
     // get a unique id
-    uint32 IDGenerator::GenerateID()
+    size_t IDGenerator::GenerateID()
     {
-        const uint32 result = mNextID.Increment();
-        MCORE_ASSERT(result != MCORE_INVALIDINDEX32); // reached the limit
+        const size_t result = mNextID++;
+        MCORE_ASSERT(result != InvalidIndex); // reached the limit
         return result;
     }
 } // namespace MCore
diff --git a/Gems/EMotionFX/Code/MCore/Source/IDGenerator.h b/Gems/EMotionFX/Code/MCore/Source/IDGenerator.h
index 04f43a4995..1418b7d3d1 100644
--- a/Gems/EMotionFX/Code/MCore/Source/IDGenerator.h
+++ b/Gems/EMotionFX/Code/MCore/Source/IDGenerator.h
@@ -28,10 +28,10 @@ namespace MCore
          * This is thread safe.
          * @return The unique id.
          */
-        uint32 GenerateID();
+        size_t GenerateID();
 
     private:
-        AtomicUInt32    mNextID;    /**< The id used for the next GenerateID() call. */
+        AZStd::atomic<size_t>    mNextID;    /**< The id used for the next GenerateID() call. */
 
         /**
          * Default constructor.