diff --git a/changes/195.bugfix.rst b/changes/195.bugfix.rst
new file mode 100644
index 0000000..e3ea944
--- /dev/null
+++ b/changes/195.bugfix.rst
@@ -0,0 +1 @@
+Fix cal_step setting when a step is skipped for roman datamodels.
diff --git a/src/stpipe/step.py b/src/stpipe/step.py
index 8776eb5..fac6849 100644
--- a/src/stpipe/step.py
+++ b/src/stpipe/step.py
@@ -477,46 +477,28 @@ def run(self, *args):
                 # Run the Step-specific code.
                 if self.skip:
                     self.log.info("Step skipped.")
-                    if isinstance(args[0], AbstractModelLibrary):
-                        library = args[0]
-                        with library:
-                            for i, model in enumerate(library):
-                                try:
-                                    setattr(
-                                        model.meta.cal_step, self.class_alias, "SKIPPED"
-                                    )
-                                except AttributeError as e:
-                                    self.log.info(
-                                        "Could not record skip into DataModel "
-                                        "header: %s",
-                                        e,
-                                    )
-                                library.shelve(model, i)
-                    elif isinstance(args[0], AbstractDataModel):
-                        if self.class_alias is not None:
+
+                    if self.class_alias is not None:
+
+                        def set_skipped(model):
+                            try:
+                                setattr(
+                                    model.meta.cal_step, self.class_alias, "SKIPPED"
+                                )
+                            except AttributeError as e:
+                                self.log.info(
+                                    "Could not record skip into DataModel "
+                                    "header: %s",
+                                    e,
+                                )
+
+                        if isinstance(args[0], AbstractModelLibrary):
+                            list(args[0].map_function(lambda m, i: set_skipped(m)))
+                        elif isinstance(args[0], AbstractDataModel):
                             if isinstance(args[0], Sequence):
-                                for model in args[0]:
-                                    try:
-                                        model[f"meta.cal_step.{self.class_alias}"] = (
-                                            "SKIPPED"
-                                        )
-                                    except AttributeError as e:  # noqa: PERF203
-                                        self.log.info(
-                                            "Could not record skip into DataModel "
-                                            "header: %s",
-                                            e,
-                                        )
-                            elif isinstance(args[0], AbstractDataModel):
-                                try:
-                                    args[0][
-                                        f"meta.cal_step.{self.class_alias}"
-                                    ] = "SKIPPED"
-                                except AttributeError as e:
-                                    self.log.info(
-                                        "Could not record skip into DataModel"
-                                        " header: %s",
-                                        e,
-                                    )
+                                [set_skipped(m) for m in args[0]]
+                            else:
+                                set_skipped(args[0])
                     step_result = args[0]
                 else:
                     if self.prefetch_references: