diff --git a/src/EventCreationService.php b/src/EventCreationService.php
index 66d9b258dabc611aca7dbdf54c04ca403a93e1a2..97e0ae3df7f42a0ef4d3a6d5007573a82c74fdcd 100644
--- a/src/EventCreationService.php
+++ b/src/EventCreationService.php
@@ -207,8 +207,12 @@ class EventCreationService {
 
     $config['type'] = $user_input['recur_type'];
 
-    $config['excluded_dates'] = $this->getDatesFromForm($user_input['excluded_dates']);
-    $config['included_dates'] = $this->getDatesFromForm($user_input['included_dates']);
+    if (!empty($user_input['excluded_dates'])) {
+      $config['excluded_dates'] = $this->getDatesFromForm($user_input['excluded_dates']);
+    }
+    if (!empty($user_input['included_dates'])) {
+      $config['included_dates'] = $this->getDatesFromForm($user_input['included_dates']);
+    }
 
     if ($config['type'] === 'custom') {
       foreach ($user_input['custom_date'] as $custom_date) {