diff --git a/platformio/app.py b/platformio/app.py
index a6fd6e45..d1283dec 100644
--- a/platformio/app.py
+++ b/platformio/app.py
@@ -129,6 +129,9 @@ class State(object):
         if hasattr(self, "_lockfile") and self._lockfile:
             self._lockfile.release()
 
+    def __del__(self):
+        self._unlock_state_file()
+
     # Dictionary Proxy
 
     def as_dict(self):