diff --git a/src/lsst/cmservice/common/htcondor.py b/src/lsst/cmservice/common/htcondor.py
index b61bd24b..c49f16fd 100644
--- a/src/lsst/cmservice/common/htcondor.py
+++ b/src/lsst/cmservice/common/htcondor.py
@@ -86,8 +86,8 @@ async def submit_htcondor_job(
 
 
 async def check_htcondor_job(
-    htcondor_id: str | None,
-) -> StatusEnum | None:
+    htcondor_id: str,
+) -> StatusEnum:
     """Check the status of a `HTConddor` job
 
     Parameters
diff --git a/src/lsst/cmservice/handlers/jobs.py b/src/lsst/cmservice/handlers/jobs.py
index 81bf84dd..e109cc93 100644
--- a/src/lsst/cmservice/handlers/jobs.py
+++ b/src/lsst/cmservice/handlers/jobs.py
@@ -219,7 +219,7 @@ async def _check_slurm_job(
     async def _check_htcondor_job(
         self,
         session: async_scoped_session,
-        htcondor_id: str | None,
+        htcondor_id: str,
         script: Script,
         parent: ElementMixin,
     ) -> StatusEnum:
diff --git a/src/lsst/cmservice/handlers/script_handler.py b/src/lsst/cmservice/handlers/script_handler.py
index fa3656aa..31a759e7 100644
--- a/src/lsst/cmservice/handlers/script_handler.py
+++ b/src/lsst/cmservice/handlers/script_handler.py
@@ -362,7 +362,7 @@ async def _check_slurm_job(  # pylint: disable=unused-argument
     async def _check_htcondor_job(  # pylint: disable=unused-argument
         self,
         session: async_scoped_session,
-        htcondor_id: str | None,
+        htcondor_id: str,
         script: Script,
         parent: ElementMixin,
     ) -> StatusEnum: