diff --git a/osaf/services/saf/amf/amfd/chkop.cc b/osaf/services/saf/amf/amfd/chkop.cc
--- a/osaf/services/saf/amf/amfd/chkop.cc
+++ b/osaf/services/saf/amf/amfd/chkop.cc
@@ -40,7 +40,6 @@
 
 #include "logtrace.h"
 #include "amfd.h"
-#include <nid_api.h>
 
 static uint32_t avsv_mbcsv_cb(NCS_MBCSV_CB_ARG *arg);
 static uint32_t avsv_mbcsv_process_enc_cb(AVD_CL_CB *cb, NCS_MBCSV_CB_ARG *arg);
@@ -445,9 +444,6 @@ ignore_msg:
 				** when in a more critical state */
 				saflog(LOG_NOTICE, amfSvcUsrName, "Cold sync complete at %x", cb->node_id_avd);
 				cb->stby_sync_state = AVD_STBY_IN_SYNC;
-				/* It is important for Standby Amfd to inform nid after it is
-				   ready for Act controller failover and accept Act role. */
-				(void) nid_notify(const_cast<char*>("AMFD"), NCSCC_RC_SUCCESS, NULL);
 			}
 
 			cb->synced_reo_type = arg->info.decode.i_reo_type;
diff --git a/osaf/services/saf/amf/amfd/main.cc b/osaf/services/saf/amf/amfd/main.cc
--- a/osaf/services/saf/amf/amfd/main.cc
+++ b/osaf/services/saf/amf/amfd/main.cc
@@ -843,11 +843,7 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 
-	/* Act Amfd need to inform nid after it has initialized itself, while
-	   Stanby Amfd need to inform nid after it has done cold sync. */
-	if (avd_cb->avail_state_avd == SA_AMF_HA_ACTIVE) {
-		(void) nid_notify(const_cast<char*>("AMFD"), NCSCC_RC_SUCCESS, NULL);
-	}
+	(void) nid_notify(const_cast<char*>("AMFD"), NCSCC_RC_SUCCESS, NULL);
 
 	main_loop();
 
diff --git a/osaf/services/saf/amf/amfd/role.cc b/osaf/services/saf/amf/amfd/role.cc
--- a/osaf/services/saf/amf/amfd/role.cc
+++ b/osaf/services/saf/amf/amfd/role.cc
@@ -259,17 +259,17 @@ static uint32_t avd_role_failover(AVD_CL
 		cb->swap_switch = false;
 	}
 
+	if (NULL == (my_node = avd_node_find_nodeid(cb->node_id_avd))) {
+		LOG_ER("FAILOVER StandBy --> Active FAILED, node %x not found", cb->node_id_avd);
+		goto done;
+	}
+
 	/*
 	 * Check whether Standby is in sync with Active. If yes then
 	 * proceed further. Else return failure.
 	 */
 	if (AVD_STBY_OUT_OF_SYNC == cb->stby_sync_state) {
 		LOG_ER("FAILOVER StandBy --> Active FAILED, Standby OUT OF SYNC");
-		return NCSCC_RC_FAILURE;
-	}
-
-	if (NULL == (my_node = avd_node_find_nodeid(cb->node_id_avd))) {
-		LOG_ER("FAILOVER StandBy --> Active FAILED, node %x not found", cb->node_id_avd);
 		goto done;
 	}