diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index 8c0d302ec0..1a59d6bc6b 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -620,7 +620,8 @@ class MogoOCHTaxiModel {
             switch ( status ) {
                 case Cancel:
                     clearCurrentOCHOrder();
-                    OCHTaxiUiController.getInstance().removeFragment();
+//                    OCHTaxiUiController.getInstance().removeFragment();
+                    OCHTaxiUiController.getInstance().onOrderStatusChanged(status.getCode());
                     break;
                 case UserArriveAtStartStation:
                     mIsArriveAtStartStation = true;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
index ad814460dd..8c919f046e 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -407,7 +407,11 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
     @Override
     public void onOrderStatusChanged(int status) {
         getActivity().runOnUiThread(() -> {
-            getPanelView().setVisibility(status != 0 ? View.VISIBLE : View.INVISIBLE);
+            if (status == OCHOrderStatus.None.getCode() || status == OCHOrderStatus.Cancel.getCode() || status == OCHOrderStatus.Completed.getCode() ){
+                getPanelView().setVisibility(View.INVISIBLE);
+            }else {
+                getPanelView().setVisibility(View.VISIBLE);
+            }
             updateOrderStatus();
         });
     }