1 files changed, 10 insertions, 6 deletions
diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
index b06c69e703..ffc325b5e4 100644
--- a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
@@ -109,6 +109,8 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) {
               logger_,
               "NaviStartStreamRequest aborted. Application can not stream");
         }
+        application_manager_.TerminateRequest(
+            connection_key(), correlation_id(), function_id());
         break;
       }
       if (hmi_apis::Common_Result::REJECTED == code) {
@@ -125,15 +127,16 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) {
 }
 
 void NaviStartStreamRequest::onTimeOut() {
+  LOG4CXX_AUTO_TRACE(logger_);
   RetryStartSession();
-
-  application_manager_.TerminateRequest(
-      connection_key(), correlation_id(), function_id());
 }
 
 void NaviStartStreamRequest::RetryStartSession() {
   LOG4CXX_AUTO_TRACE(logger_);
 
+  application_manager_.TerminateRequest(
+      connection_key(), correlation_id(), function_id());
+
   ApplicationSharedPtr app =
       application_manager_.application_by_hmi_app(application_id());
   if (!app) {
@@ -156,10 +159,11 @@ void NaviStartStreamRequest::RetryStartSession() {
   }
 
   uint32_t curr_retry_number = app->video_stream_retry_number();
+  LOG4CXX_DEBUG(
+      logger_, "Retry number " << curr_retry_number << " of " << retry_number_);
+
   if (curr_retry_number < retry_number_) {
-    LOG4CXX_DEBUG(
-        logger_,
-        "Send NaviStartStream retry. retry_number = " << curr_retry_number);
+    LOG4CXX_DEBUG(logger_, "Send NaviStartStream retry");
     MessageHelper::SendNaviStartStream(app->app_id(), application_manager_);
     app->set_video_stream_retry_number(++curr_retry_number);
   } else {