1 files changed, 14 insertions, 3 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
index 40bb1ddfc9..4b40b7a9ce 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
@@ -71,9 +71,20 @@ void UnsubscribeWayPointsRequest::Run() {
     return;
   }
 
-  StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_Navigation);
-  SendHMIRequest(
-      hmi_apis::FunctionID::Navigation_UnsubscribeWayPoints, NULL, true);
+  std::set<uint32_t> subscribed_apps =
+      application_manager_.GetAppsSubscribedForWayPoints();
+
+  if (subscribed_apps.size() > 1) {
+    // More than 1 subscribed app, don't send HMI unsubscribe request
+    application_manager_.UnsubscribeAppFromWayPoints(app);
+    SendResponse(true, mobile_apis::Result::SUCCESS, NULL);
+    return;
+  } else {
+    // Only subscribed app, send HMI unsubscribe request
+    StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_Navigation);
+    SendHMIRequest(
+        hmi_apis::FunctionID::Navigation_UnsubscribeWayPoints, NULL, true);
+  }
 }
 
 void UnsubscribeWayPointsRequest::on_event(const event_engine::Event& event) {