diff --git a/jupyterhub/user.py b/jupyterhub/user.py
index f847245b..a970c120 100644
--- a/jupyterhub/user.py
+++ b/jupyterhub/user.py
@@ -828,8 +828,12 @@ class User:
                 await maybe_future(spawner.run_post_stop_hook())
             except:
                 spawner.clear_state()
+                spawner.orm_spawner.state = spawner.get_state()
+                self.db.commit()
                 raise
             spawner.clear_state()
+            spawner.orm_spawner.state = spawner.get_state()
+            self.db.commit()
 
             # trigger post-spawner hook on authenticator
             auth = spawner.authenticator