diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index fb80f214f..9b8e14dd0 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -980,11 +980,7 @@
                   <div class="form-group row" id="finish_date_field">
                     <label class="col-lg-2 col-form-label" for="finish_date">Abgeschlossen am</label>
                     <div class="col-lg-4">
-                      <?php if($order->shippingdate): ?>
-                      <input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=date("d.m.Y", $order->shippingdate)?>" />
-                      <?php else: ?>
-                      <input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=($order->shippingdate ? $order->shippingdate : $order->finish_date) ? date("d.m.Y", $order->finish_date) : ""?>" />
-                      <?php endif; ?>
+                      <input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=($order->finish_date) ? date("d.m.Y", $order->finish_date) : ""?>" />
                     </div>
                   </div>
                   <?php endif; ?>