1 files changed, 7 insertions, 8 deletions
diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
index db7477aae2..1e46eab52e 100644
--- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
@@ -63,20 +63,19 @@ void AudioStartStreamRequest::Run() {
     LOG4CXX_INFO(logger_, "Interface Navi is not supported by system");
     return;
   }
-  SetAllowedToTerminate(false);
-  subscribe_on_event(hmi_apis::FunctionID::Navigation_StartAudioStream,
-                     correlation_id());
-
   ApplicationSharedPtr app =
       application_manager_.application_by_hmi_app(application_id());
-  if (app) {
-    app->set_audio_streaming_allowed(true);
-    SendRequest();
-  } else {
+  if (!app) {
     LOG4CXX_ERROR(logger_,
                   "Applcation with hmi_app_id " << application_id()
                                                 << " does not exist");
+    return;
   }
+  SetAllowedToTerminate(false);
+  subscribe_on_event(hmi_apis::FunctionID::Navigation_StartAudioStream,
+                     correlation_id());
+  app->set_audio_streaming_allowed(true);
+  SendRequest();
 }
 
 void AudioStartStreamRequest::on_event(const event_engine::Event& event) {