diff --git a/src/deadline_worker_agent/sessions/job_entities/job_details.py b/src/deadline_worker_agent/sessions/job_entities/job_details.py
index 61cdd6ee..d250e7ff 100644
--- a/src/deadline_worker_agent/sessions/job_entities/job_details.py
+++ b/src/deadline_worker_agent/sessions/job_entities/job_details.py
@@ -376,7 +376,9 @@ def validate_entity_data(
                     ),
                 )
 
-        if job_user_override is not None:
+        if job_user_override is not None and (
+            job_user_override.run_as_agent or job_user_override.job_user
+        ):
             # If there is an override, we don't care about the job details jobRunAsUser
             entity_data.pop("jobRunAsUser", None)
         elif run_as_value := entity_data.get("jobRunAsUser", dict()).get("runAs", None):
diff --git a/test/unit/sessions/job_entities/test_job_entities.py b/test/unit/sessions/job_entities/test_job_entities.py
index d27df2b2..2de08545 100644
--- a/test/unit/sessions/job_entities/test_job_entities.py
+++ b/test/unit/sessions/job_entities/test_job_entities.py
@@ -269,7 +269,9 @@ def test_job_run_as_user(
         }
 
         # WHEN
-        job_details_data = JobDetails.validate_entity_data(api_response, job_user_override=None)
+        job_details_data = JobDetails.validate_entity_data(
+            api_response, job_user_override=JobsRunAsUserOverride(run_as_agent=False, job_user=None)
+        )
         entity_obj = JobDetails.from_boto(job_details_data)
 
         # THEN