diff --git a/Source/Core/Common/BitField.h b/Source/Core/Common/BitField.h
index 4d6a269e90..85a595239c 100644
--- a/Source/Core/Common/BitField.h
+++ b/Source/Core/Common/BitField.h
@@ -165,7 +165,7 @@ private:
 
   static constexpr StorageType GetMask()
   {
-    return (((StorageTypeU)~0) >> (8 * sizeof(T) - bits)) << position;
+    return (std::numeric_limits<StorageTypeU>::max() >> (8 * sizeof(T) - bits)) << position;
   }
 
   StorageType storage;