diff --git a/resources/views/livewire/devices/configure.blade.php b/resources/views/livewire/devices/configure.blade.php
index 223ecc4..3273524 100644
--- a/resources/views/livewire/devices/configure.blade.php
+++ b/resources/views/livewire/devices/configure.blade.php
@@ -196,6 +196,12 @@ new class extends Component {
             'refresh_time' => 'nullable|integer|min:60',
         ]);
 
+        if (empty($this->active_from)) {
+            $this->active_from = null;
+        }
+        if (empty($this->active_until)) {
+            $this->active_until = null;
+        }
         if ($this->refresh_time < 60) {
             $this->refresh_time = null;
         }
diff --git a/resources/views/livewire/playlists/index.blade.php b/resources/views/livewire/playlists/index.blade.php
index b96814b..e31993f 100644
--- a/resources/views/livewire/playlists/index.blade.php
+++ b/resources/views/livewire/playlists/index.blade.php
@@ -96,6 +96,12 @@ new class extends Component {
             'refresh_time' => 'nullable|integer|min:60',
         ]);
 
+        if (empty($this->active_from)) {
+            $this->active_from = null;
+        }
+        if (empty($this->active_until)) {
+            $this->active_until = null;
+        }
         if ($this->refresh_time < 60) {
             $this->refresh_time = null;
         }