1 files changed, 7 insertions, 5 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc
index 973c323ebe..f5d96d0ea8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc
@@ -53,14 +53,15 @@ NaviStartStreamRequest::NaviStartStreamRequest(
                    rpc_service,
                    hmi_capabilities,
                    policy_handle)
-    , EventObserver(application_manager.event_dispatcher())
     , retry_number_(0) {
   SDL_LOG_AUTO_TRACE();
   std::pair<uint32_t, int32_t> stream_retry =
       application_manager_.get_settings().start_stream_retry_amount();
-  default_timeout_ = stream_retry.second;
+  default_timeout_ =
+      stream_retry.second +
+      application_manager_.get_settings().default_timeout_compensation();
   retry_number_ = stream_retry.first;
-  SDL_LOG_DEBUG("default_timeout_ = " << default_timeout_
+  SDL_LOG_DEBUG("default_timeout_ = " << stream_retry.second
                                       << "; retry_number_ = " << retry_number_);
 }
 
@@ -138,12 +139,13 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) {
   }
 }
 
-void NaviStartStreamRequest::onTimeOut() {
+void NaviStartStreamRequest::OnTimeOut() {
   SDL_LOG_AUTO_TRACE();
   RetryStartSession();
 }
 
 void NaviStartStreamRequest::RetryStartSession() {
+  using namespace protocol_handler;
   SDL_LOG_AUTO_TRACE();
 
   auto retry_start_session = [this](const uint32_t hmi_app_id) {
@@ -178,7 +180,7 @@ void NaviStartStreamRequest::RetryStartSession() {
       SDL_LOG_DEBUG("NaviStartStream retry sequence stopped. "
                     << "Attempts expired");
 
-      application_manager_.EndNaviServices(app->app_id());
+      application_manager_.EndService(app->app_id(), ServiceType::kMobileNav);
     }
   };