diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 5d598095c..420485e4c 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -411,7 +411,7 @@
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="order_date">Bestelldatum</label>
                     <div class="col-lg-4">
-                      <input type="text" class="form-control" name="order_date" id="order_date" value="<?=($order->order_date) ? date("d.m.Y", $order->order_date) : date("d.m.Y")?>" />
+                      <input type="text" class="form-control" name="order_date" id="order_date" value="<?=($order->order_date) ? date("d.m.Y", $order->order_date) : ""?>" />
                     </div>
                   </div>
                   <div class="form-group row">
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index dcb836a34..a7d9dd3e6 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -723,7 +723,7 @@ class OrderController extends mfBaseController {
     $order_data['allow_spin'] = ($r->allow_spin) ? 1 : 0;
     $order_data['note'] = $r->note;
     
-    $order_data['order_date'] = ($order_data['order_date']) ? Layout::dateToInt($r->order_date) : null;
+    $order_data['order_date'] = ($order_data['order_date']) ? Layout::dateToInt($r->order_date) : date("U");
     
     if($r->finish_after) {
       $order_data['finish_after'] = Layout::dateToInt($r->finish_after);