diff --git a/letta/orm/step.py b/letta/orm/step.py
index 00f7a37b..13d6d552 100644
--- a/letta/orm/step.py
+++ b/letta/orm/step.py
@@ -75,9 +75,9 @@ class Step(SqlalchemyBase, ProjectMixin):
     status: Mapped[Optional[StepStatus]] = mapped_column(None, nullable=True, doc="Step status: pending, success, or failed")
 
     # Relationships (foreign keys)
-    organization: Mapped[Optional["Organization"]] = relationship("Organization")
-    provider: Mapped[Optional["Provider"]] = relationship("Provider")
-    run: Mapped[Optional["Run"]] = relationship("Run", back_populates="steps")
+    organization: Mapped[Optional["Organization"]] = relationship("Organization", lazy="raise")
+    provider: Mapped[Optional["Provider"]] = relationship("Provider", lazy="raise")
+    run: Mapped[Optional["Run"]] = relationship("Run", back_populates="steps", lazy="raise")
 
     # Relationships (backrefs)
     messages: Mapped[List["Message"]] = relationship("Message", back_populates="step", cascade="save-update", lazy="noload")
diff --git a/letta/orm/step_metrics.py b/letta/orm/step_metrics.py
index ead5feda..267630f4 100644
--- a/letta/orm/step_metrics.py
+++ b/letta/orm/step_metrics.py
@@ -82,8 +82,8 @@ class StepMetrics(SqlalchemyBase, ProjectMixin, AgentMixin):
 
     # Relationships (foreign keys)
     step: Mapped["Step"] = relationship("Step", back_populates="metrics", uselist=False)
-    run: Mapped[Optional["Run"]] = relationship("Run")
-    agent: Mapped[Optional["Agent"]] = relationship("Agent")
+    run: Mapped[Optional["Run"]] = relationship("Run", lazy="raise")
+    agent: Mapped[Optional["Agent"]] = relationship("Agent", lazy="raise")
 
     def create(
         self,