diff --git a/patroni/ha.py b/patroni/ha.py
index 72bd72b1..1759c93f 100644
--- a/patroni/ha.py
+++ b/patroni/ha.py
@@ -1332,6 +1332,7 @@ class Ha(object):
 
             if not self.state_handler.is_healthy():
                 if self.is_paused():
+                    self.state_handler.set_state('stopped')
                     if self.has_lock():
                         self._delete_leader()
                         return 'removed leader lock because postgres is not running'
@@ -1344,6 +1345,8 @@ class Ha(object):
                             (self._rewind.is_needed and self._rewind.can_rewind_or_reinitialize_allowed):
                         return 'postgres is not running'
 
+                if self.state_handler.state in ('running', 'starting'):
+                    self.state_handler.set_state('crashed')
                 # try to start dead postgres
                 return self.recover()