diff --git a/repmgr.c b/repmgr.c
index 4461a354..001c2848 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -492,10 +492,10 @@ unset_bdr_failover_handler(PG_FUNCTION_ARGS)
 		LWLockAcquire(shared_state->lock, LW_EXCLUSIVE);
 
 		shared_state->bdr_failover_handler = UNKNOWN_NODE_ID;
-
-		LWLockRelease(shared_state->lock);
 	}
 
+	LWLockRelease(shared_state->lock);
+
 	PG_RETURN_VOID();
 }