diff --git a/python_modules/dagster/dagster/_core/execution/context/compute.py b/python_modules/dagster/dagster/_core/execution/context/compute.py
index 4a9bb9317e670..42a1917a5da67 100644
--- a/python_modules/dagster/dagster/_core/execution/context/compute.py
+++ b/python_modules/dagster/dagster/_core/execution/context/compute.py
@@ -1504,7 +1504,7 @@ def build_execution_context(
 
     """
     is_sda_step = step_context.is_sda_step
-    is_op_in_graph_asset = step_context.is_graph_asset_op
+    is_op_in_graph_asset = is_sda_step and step_context.is_op_in_graph
     context_annotation = EmptyAnnotation
     compute_fn = step_context.op_def._compute_fn  # noqa: SLF001
     compute_fn = (
diff --git a/python_modules/dagster/dagster/_core/execution/context/system.py b/python_modules/dagster/dagster/_core/execution/context/system.py
index 80b1e42de08b7..2e75147d13c42 100644
--- a/python_modules/dagster/dagster/_core/execution/context/system.py
+++ b/python_modules/dagster/dagster/_core/execution/context/system.py
@@ -865,7 +865,7 @@ def op_config(self) -> Any:
         return op_config.config if op_config else None
 
     @property
-    def is_graph_asset_op(self) -> bool:
+    def is_op_in_graph(self) -> bool:
         return self.step.node_handle.parent is not None
 
     @property