diff --git a/patroni/postgresql.py b/patroni/postgresql.py
index 789f4471..4462c524 100644
--- a/patroni/postgresql.py
+++ b/patroni/postgresql.py
@@ -179,6 +179,8 @@ class Postgresql(object):
             self._write_postgresql_conf()  # we are "joining" already running postgres
             if self._replace_pg_hba():
                 self.reload()
+        elif self.role == 'master':
+            self.set_role('demoted')
 
     @property
     def _create_replica_methods(self):