1 files changed, 3 insertions, 0 deletions
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index 61451e3602..a1e8eeed3c 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -210,6 +210,7 @@ bool ApplicationImpl::IsAudioApplication() const {
 
 void ApplicationImpl::SetRegularState(HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK_OR_RETURN_VOID(state->app_id() == app_id());
   state_.AddState(state);
 }
 
@@ -220,6 +221,7 @@ void ApplicationImpl::RemovePostponedState() {
 
 void ApplicationImpl::SetPostponedState(HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK_OR_RETURN_VOID(state->app_id() == app_id());
   state_.AddState(state);
 }
 
@@ -233,6 +235,7 @@ struct StateIDComparator {
 
 void ApplicationImpl::AddHMIState(HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK_OR_RETURN_VOID(state->app_id() == app_id());
   state_.AddState(state);
 }