diff --git a/colleges/forms.py b/colleges/forms.py
index 7169f95e4f229d78ef2c4305692622e870303893..b08cb388b4551f946860dfe5ff24249aac091986 100644
--- a/colleges/forms.py
+++ b/colleges/forms.py
@@ -63,7 +63,7 @@ class FellowshipTerminateForm(forms.ModelForm):
     def save(self):
         today = datetime.date.today()
         fellowship = self.instance
-        if fellowship.until_date > today:
+        if not fellowship.until_date or fellowship.until_date > today:
             fellowship.until_date = today
         return fellowship.save()