diff --git a/python_modules/dagster/dagster/_core/pipes/context.py b/python_modules/dagster/dagster/_core/pipes/context.py
index 182aa13fb3835..e626733d98571 100644
--- a/python_modules/dagster/dagster/_core/pipes/context.py
+++ b/python_modules/dagster/dagster/_core/pipes/context.py
@@ -39,7 +39,7 @@
 from dagster._core.errors import DagsterPipesExecutionError
 from dagster._core.events import EngineEventData
 from dagster._core.execution.context.compute import OpExecutionContext
-from dagster._core.execution.context.invocation import RunlessOpExecutionContext
+from dagster._core.execution.context.invocation import BaseRunlessContext
 from dagster._utils.error import (
     ExceptionInfo,
     SerializableErrorInfo,
@@ -388,8 +388,8 @@ def build_external_execution_context_data(
             _convert_time_window(partition_time_window) if partition_time_window else None
         ),
         run_id=context.run_id,
-        job_name=None if isinstance(context, RunlessOpExecutionContext) else context.job_name,
-        retry_number=0 if isinstance(context, RunlessOpExecutionContext) else context.retry_number,
+        job_name=None if isinstance(context, BaseRunlessContext) else context.job_name,
+        retry_number=0 if isinstance(context, BaseRunlessContext) else context.retry_number,
         extras=extras or {},
     )