Revert "End navi services on unregistering application"

This reverts commit 7f9ed8aa6ab076d7f22f5e06a04bdfa607430e5b.

2 files changed, 1 insertions, 1 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index d4d029deaf..a69b6a34a1 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -3342,7 +3342,6 @@ void ApplicationManagerImpl::UnregisterApplication(
     MessageHelper::SendUnsubscribedWayPoints(*this);
   }
 
-  EndNaviServices(app_id);
   {
     sync_primitives::AutoLock lock(navi_service_status_lock_);
 
diff --git a/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc
index d7056a624e..d40ad9c870 100644
--- a/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc
@@ -53,6 +53,7 @@ void UnregisterAppInterfaceRequest::Run() {
           connection_key(),
           mobile_api::AppInterfaceUnregisteredReason::INVALID_ENUM),
       commands::Command::ORIGIN_SDL);
+  application_manager_.EndNaviServices(connection_key());
   application_manager_.UnregisterApplication(connection_key(),
                                              mobile_apis::Result::SUCCESS);
   SendResponse(true, mobile_apis::Result::SUCCESS);