diff --git a/jsonstore.py b/jsonstore.py
index b6dafdf..d1c6ddd 100644
--- a/jsonstore.py
+++ b/jsonstore.py
@@ -36,7 +36,11 @@ def __exit__(self, *args):
         if any(args):
             self.__dict__["_data"] = previous_state
         elif not self.__dict__["_states"]:
-            self._save()
+            try:
+                self._save()
+            except BaseException:
+                self.__dict__["_data"] = previous_state
+                raise
 
     def _do_auto_commit(self):
         if self._auto_commit and not self.__dict__["_states"]:
diff --git a/test_jsonstore.py b/test_jsonstore.py
index 3bb7221..89e339a 100644
--- a/test_jsonstore.py
+++ b/test_jsonstore.py
@@ -420,6 +420,38 @@ def test_transaction_rollback(self):
             pass
         self.assertEqual(self.store.value, 1)
 
+    def test_failed_transaction_commit_restores_state(self):
+        self.store.value = {"items": [1]}
+        for auto_commit in (False, True):
+            with self.subTest(auto_commit=auto_commit):
+                store = JsonStore(self._store_file, auto_commit=auto_commit)
+                with patch("jsonstore.os.replace", side_effect=OSError("commit failed")):
+                    with self.assertRaisesRegex(OSError, "commit failed"):
+                        with store:
+                            store["value", "items", 0] = 2
+                            with store:
+                                store.extra = 3
+                self.assertEqual(store.value, {"items": [1]})
+                self.assertNotIn("extra", store)
+                self.assertEqual(JsonStore(self._store_file).value, {"items": [1]})
+                self.assertNotIn("extra", JsonStore(self._store_file))
+                self.assertEqual(store._states, [])
+
+                with store:
+                    store.value = {"items": [4]}
+                self.assertEqual(JsonStore(self._store_file).value, {"items": [4]})
+                self.store.value = {"items": [1]}
+
+    def test_interrupted_transaction_commit_restores_state(self):
+        self.store.value = 1
+        with patch.object(JsonStore, "_save", side_effect=KeyboardInterrupt):
+            with self.assertRaises(KeyboardInterrupt):
+                with self.store:
+                    self.store.value = 2
+        self.assertEqual(self.store.value, 1)
+        self.assertEqual(JsonStore(self._store_file).value, 1)
+        self.assertEqual(self.store._states, [])
+
     def test_transaction_commit(self):
         self.store.value = 1
         self.store.remove_me = "bye"