diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 5075d5652185..5284f7779ab4 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -1655,6 +1655,8 @@ def set_state(self, state):
                 .values(state=state)
             )
             if rval.rowcount == 1:
+                # Need to expire state since we just updated it, but ORM doesn't know about it.
+                session.expire(self, ["state"])
                 self.state_history.append(JobStateHistory(self))
                 return True
             else: