diff --git a/src/agenda_culturel/forms.py b/src/agenda_culturel/forms.py
index 26a666b..3ff6c20 100644
--- a/src/agenda_culturel/forms.py
+++ b/src/agenda_culturel/forms.py
@@ -236,7 +236,7 @@ class SelectEventInList(Form):
         super().__init__(*args, **kwargs)
 
         self.fields["event"].choices = [
-            (e.pk, str(e.start_day) + " " + e.title + ", " + e.location) for e in events
+            (e.pk, str(e.start_day) + " " + e.title + ((", " + e.location) if e.location else "")) for e in events
         ]