diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
index 42cf8f08ea..759a844c0f 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
@@ -723,8 +723,9 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                     naviToStart.visibility = View.VISIBLE
                 }
             }
-            if (currentTaskWithOrder?.currentStatus == TaskStatusEnum.StartTask.code
-            ) {
+            if ((currentTaskWithOrder?.currentStatus == TaskStatusEnum.StartTask.code
+                        && currentTaskWithOrder.order == null)
+                || (currentTaskWithOrder?.order?.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.code)) {
                 if (naviToEnd.visibility == View.GONE) {
                     naviToEnd.visibility = View.VISIBLE
                 }