diff -r 4a7fa94f53dd osaf/services/saf/amf/amfd/csi.cc
--- a/osaf/services/saf/amf/amfd/csi.cc	Thu Nov 14 16:05:16 2013 +0100
+++ b/osaf/services/saf/amf/amfd/csi.cc	Wed Nov 20 15:39:10 2013 +0100
@@ -727,6 +727,8 @@
 					goto done;
 				}
 
+				avd_sg_su_oper_list_add(avd_cb, t_sisu->su, false);
+				m_AVD_SET_SG_FSM(avd_cb, t_sisu->su->sg_of_su, AVD_SG_FSM_SU_OPER);
 			}
 			t_sisu->csi_add_rem = static_cast<SaBoolT>(true);
 			t_sisu->comp_name = t_csicomp->comp->comp_info.name;
diff -r 4a7fa94f53dd osaf/services/saf/amf/amfd/sgproc.cc
--- a/osaf/services/saf/amf/amfd/sgproc.cc	Thu Nov 14 16:05:16 2013 +0100
+++ b/osaf/services/saf/amf/amfd/sgproc.cc	Wed Nov 20 15:39:10 2013 +0100
@@ -850,6 +850,8 @@
 				m_AVSV_SEND_CKPT_UPDT_ASYNC_RMV (avd_cb, susi, AVSV_CKPT_AVD_SI_ASS);
 
 				susi->csi_add_rem = static_cast<SaBoolT>(false);
+				avd_sg_su_oper_list_del(cb, susi->su->sg_of_su->su_oper_list.su, false);
+				m_AVD_SET_SG_FSM(cb, susi->su->sg_of_su, AVD_SG_FSM_STABLE);
 				comp = avd_comp_get(&susi->comp_name);
 				osafassert(comp);
 				csi = avd_csi_get(&susi->csi_name);
@@ -883,6 +885,8 @@
 						}
 						osafassert(t_comp_csi);
 						avd_snd_susi_msg(cb, t_sisu->su, t_sisu, AVSV_SUSI_ACT_DEL, true, t_comp_csi);
+						avd_sg_su_oper_list_add(avd_cb, t_sisu->su, false);
+						m_AVD_SET_SG_FSM(avd_cb, t_sisu->su->sg_of_su, AVD_SG_FSM_SU_OPER);
 						/* Break here. We need to send one by one.  */
 						break;
 					}
@@ -911,6 +915,8 @@
 
 				osafassert(susi->csi_add_rem);
 				susi->csi_add_rem = static_cast<SaBoolT>(false);
+				avd_sg_su_oper_list_del(cb, susi->su->sg_of_su->su_oper_list.su, false);
+				m_AVD_SET_SG_FSM(cb, susi->su->sg_of_su, AVD_SG_FSM_STABLE);
 				comp = avd_comp_get(&susi->comp_name);
 				osafassert(comp);
 				csi = avd_csi_get(&susi->csi_name);
@@ -939,6 +945,8 @@
 						}
 						osafassert(t_comp_csi);
 						avd_snd_susi_msg(cb, t_sisu->su, t_sisu, AVSV_SUSI_ACT_ASGN, true, t_comp_csi); 
+						avd_sg_su_oper_list_add(avd_cb, t_sisu->su, false);
+						m_AVD_SET_SG_FSM(avd_cb, t_sisu->su->sg_of_su, AVD_SG_FSM_SU_OPER);
 						/* Break here. We need to send one by one.  */
 						break;
 					}