diff --git a/repmgr-action-node.c b/repmgr-action-node.c
index ff1410c6..042ceaff 100644
--- a/repmgr-action-node.c
+++ b/repmgr-action-node.c
@@ -783,15 +783,6 @@ do_node_check(void)
 		exit(return_code);
 	}
 
-	if (runtime_options.downstream == true)
-	{
-		return_code = do_node_check_downstream(conn,
-											   runtime_options.output_mode,
-											   NULL);
-		PQfinish(conn);
-		exit(return_code);
-	}
-
 	if (runtime_options.upstream == true)
 	{
 		return_code = do_node_check_upstream(conn,
@@ -802,6 +793,15 @@ do_node_check(void)
 		exit(return_code);
 	}
 
+	if (runtime_options.downstream == true)
+	{
+		return_code = do_node_check_downstream(conn,
+											   runtime_options.output_mode,
+											   NULL);
+		PQfinish(conn);
+		exit(return_code);
+	}
+
 	if (runtime_options.replication_lag == true)
 	{
 		return_code = do_node_check_replication_lag(conn,
@@ -885,10 +885,10 @@ do_node_check(void)
 	if (do_node_check_archive_ready(conn, runtime_options.output_mode, &status_list) != CHECK_STATUS_OK)
 		issue_detected = true;
 
-	if (do_node_check_downstream(conn, runtime_options.output_mode, &status_list) != CHECK_STATUS_OK)
+	if (do_node_check_upstream(conn, runtime_options.output_mode, &node_info, &status_list) != CHECK_STATUS_OK)
 		issue_detected = true;
 
-	if (do_node_check_upstream(conn, runtime_options.output_mode, &node_info, &status_list) != CHECK_STATUS_OK)
+	if (do_node_check_downstream(conn, runtime_options.output_mode, &status_list) != CHECK_STATUS_OK)
 		issue_detected = true;
 
 	if (do_node_check_slots(conn, runtime_options.output_mode, &node_info, &status_list) != CHECK_STATUS_OK)