diff --git a/CIME/XML/env_batch.py b/CIME/XML/env_batch.py
index a18d499f2fc..aea6342b457 100644
--- a/CIME/XML/env_batch.py
+++ b/CIME/XML/env_batch.py
@@ -223,6 +223,9 @@ def get_job_overrides(self, job, case):
             overrides["tasks_per_node"] = tasks_per_node
             if thread_count:
                 overrides["thread_count"] = thread_count
+                total_tasks = total_tasks * thread_count
+            else:
+                total_tasks = total_tasks * case.thread_count
         else:
             # Total PES accounts for threads as well as mpi tasks
             total_tasks = case.get_value("TOTALPES")