diff --git a/.generator/src/generator/templates/model_utils.j2 b/.generator/src/generator/templates/model_utils.j2
index aba996158b..e34299cc02 100644
--- a/.generator/src/generator/templates/model_utils.j2
+++ b/.generator/src/generator/templates/model_utils.j2
@@ -572,7 +572,7 @@ COERCION_INDEX_BY_TYPE = {
 UPCONVERSION_TYPE_PAIRS = (
     (str, datetime),
     (str, date),
-    (str, UUID),
+    # (str, UUID), # Strings shouldn't always be converted to UUIDs, only when the format is a UUID explicitly.
     (int, float),  # A float may be serialized as an integer, e.g. '3' is a valid serialized float.
     (list, ModelComposed),
     (dict, ModelComposed),
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8f0104fd81..2473bc726a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,7 +27,7 @@ repos:
     entry: bash -c "SPHINX_APIDOC_OPTIONS=members,show-inheritance sphinx-apidoc --output-dir docs --force --no-toc --templatedir docs/_templates src/datadog_api_client *apis *models *version.py"
     pass_filenames: false
     additional_dependencies:
-      - Sphinx
+      - Sphinx==7.4.0
   - id: generator
     name: generator
     language: python
diff --git a/src/datadog_api_client/model_utils.py b/src/datadog_api_client/model_utils.py
index 8298487f6f..ab74f6ef92 100644
--- a/src/datadog_api_client/model_utils.py
+++ b/src/datadog_api_client/model_utils.py
@@ -586,7 +586,7 @@ def __eq__(self, other):
 UPCONVERSION_TYPE_PAIRS = (
     (str, datetime),
     (str, date),
-    (str, UUID),
+    # (str, UUID), # Strings shouldn't always be converted to UUIDs, only when the format is a UUID explicitly.
     (int, float),  # A float may be serialized as an integer, e.g. '3' is a valid serialized float.
     (list, ModelComposed),
     (dict, ModelComposed),