diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py
index b81093cf1..9018c2895 100644
--- a/src/pretix/control/forms/event.py
+++ b/src/pretix/control/forms/event.py
@@ -154,6 +154,7 @@ class EventWizardBasicsForm(I18nModelForm):
         if self.has_subevents:
             del self.fields['presale_start']
             del self.fields['presale_end']
+            del self.fields['date_to']
 
         if self.has_control_rights(self.user, self.organizer):
             del self.fields['team']
diff --git a/src/pretix/control/templates/pretixcontrol/events/create_basics.html b/src/pretix/control/templates/pretixcontrol/events/create_basics.html
index f2575d5f1..4dcd3859f 100644
--- a/src/pretix/control/templates/pretixcontrol/events/create_basics.html
+++ b/src/pretix/control/templates/pretixcontrol/events/create_basics.html
@@ -36,7 +36,9 @@
             </div>
         </div>
         {% bootstrap_field form.date_from layout="control" %}
-        {% bootstrap_field form.date_to layout="control" %}
+        {% if form.date_to %}
+            {% bootstrap_field form.date_to layout="control" %}
+        {% endif %}
         <div class="geodata-section">
             {% bootstrap_field form.location layout="control" %}
             <div class="form-group geodata-group" data-tiles="{{ global_settings.leaflet_tiles|default_if_none:"" }}" data-attrib="{{ global_settings.leaflet_tiles_attribution }}" data-icon="{% static "leaflet/images/marker-icon.png" %}" data-shadow="{% static "leaflet/images/marker-shadow.png" %}">
diff --git a/src/pretix/control/views/main.py b/src/pretix/control/views/main.py
index a4637fc3b..6785e83f3 100644
--- a/src/pretix/control/views/main.py
+++ b/src/pretix/control/views/main.py
@@ -251,19 +251,6 @@ class EventWizard(SafeSessionWizardView):
                     t.members.add(self.request.user)
                     t.limit_events.add(event)
 
-            if event.has_subevents:
-                se = event.subevents.create(
-                    name=event.name,
-                    date_from=event.date_from,
-                    date_to=event.date_to,
-                    presale_start=event.presale_start,
-                    presale_end=event.presale_end,
-                    location=event.location,
-                    geo_lat=event.geo_lat,
-                    geo_lon=event.geo_lon,
-                    active=True
-                )
-
             logdata = {}
             for f in form_list:
                 logdata.update({
@@ -277,17 +264,10 @@ class EventWizard(SafeSessionWizardView):
             elif self.clone_from:
                 event.copy_data_from(self.clone_from)
             else:
-                if event.has_subevents:
-                    event.checkin_lists.create(
-                        name=str(se),
-                        all_products=True,
-                        subevent=se
-                    )
-                else:
-                    event.checkin_lists.create(
-                        name=_('Default'),
-                        all_products=True
-                    )
+                event.checkin_lists.create(
+                    name=_('Default'),
+                    all_products=True
+                )
                 event.set_defaults()
 
             if basics_data['tax_rate']:
diff --git a/src/tests/control/test_events.py b/src/tests/control/test_events.py
index 666e4bd5d..79c34eb2b 100644
--- a/src/tests/control/test_events.py
+++ b/src/tests/control/test_events.py
@@ -655,7 +655,7 @@ class EventsTest(SoupTest):
         with scopes_disabled():
             ev = Event.objects.get(slug='33c3')
             assert ev.has_subevents
-            assert ev.subevents.count() == 1
+            assert ev.subevents.count() == 0
 
     def test_create_event_copy_success(self):
         with scopes_disabled():