diff --git a/app/forms.py b/app/forms.py
index f884643..5a51f8c 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -82,7 +82,7 @@ class CreatePitstopForm(Form):
         if self.date.data:
             self.date.default = self.date.data
         else:
-            self.date.default = self.last_pitstop.date
+            self.date.default = date.today()
         if self.odometer.data:
             self.odometer.default = self.odometer.data
         else: