diff --git a/src/Form/POSForm.php b/src/Form/POSForm.php
index caea608..aa6fe4e 100644
--- a/src/Form/POSForm.php
+++ b/src/Form/POSForm.php
@@ -85,7 +85,6 @@ class POSForm extends ContentEntityForm {
     $step = $form_state->get('step');
     $step = $step ?: 'order';
     $form_state->set('step', $step);
-    $form_state->set('is_parked', $this->currentOrder->isParked());
 
     if ($step == 'order') {
       $form = $this->buildOrderForm($form, $form_state);
@@ -131,14 +130,12 @@ class POSForm extends ContentEntityForm {
       ]);
     }
 
-    if (!$form_state->get('is_parked')) {
-      $form['actions']['park_order'] = [
-        '#type' => 'submit',
-        '#value' => $this->t('Park Order'),
-        '#weight' => 6,
-        '#submit' => ['::parkOrder'],
-      ];
-    }
+    $form['actions']['park_order'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Park Order'),
+      '#weight' => 6,
+      '#submit' => ['::parkOrder'],
+    ];
 
     return $form;
   }
@@ -281,13 +278,11 @@ class POSForm extends ContentEntityForm {
       '#element_key' => 'finish-order',
     ];
 
-    if (!$form_state->get('is_parked')) {
-      $form['actions']['park_order'] = [
-        '#type' => 'submit',
-        '#value' => $this->t('Park Order'),
-        '#submit' => ['::parkOrder'],
-      ];
-    }
+    $form['actions']['park_order'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Park Order'),
+      '#submit' => ['::parkOrder'],
+    ];
 
     $form['actions']['back'] = [
       '#type' => 'submit',
@@ -627,7 +622,6 @@ class POSForm extends ContentEntityForm {
     $order->save();
 
     \Drupal::service('commerce_pos.current_order')->set($order);
-
   }
 
   /**
@@ -652,6 +646,7 @@ class POSForm extends ContentEntityForm {
    */
   public function parkOrder(array &$form, FormStateInterface $form_state) {
     $this->currentOrder->park();
+    $this->clearOrder();
   }
 
   /**