diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 2fde5a1fb..6620abe22 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -712,7 +712,7 @@
                     <?=$order->terminations[0]->building->zip?> <?=$order->terminations[0]->building->city?>
                   <?php endif; ?>
                 </td>
-                <td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=date("d.m.Y", $order->order_date)?></td>
+                <td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=($order->order_date) ? date("d.m.Y", $order->order_date) : ""?></td>
                 <td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=date("d.m.Y", $order->edit)?></td>
                 <td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=$order->editor->name?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index a7d9dd3e6..a0e63ea5d 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) : date("U");
+    $order_data['order_date'] = ($r->order_date) ? Layout::dateToInt($r->order_date) : date("U");
     
     if($r->finish_after) {
       $order_data['finish_after'] = Layout::dateToInt($r->finish_after);