diff --git a/extensions/suspend/src/Listener/SaveSuspensionToDatabase.php b/extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
index 4ef02d412..0a7c39e03 100755
--- a/extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
+++ b/extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
@@ -59,7 +59,9 @@ class SaveSuspensionToDatabase
 
             $this->assertCan($actor, 'suspend', $user);
 
-            $user->suspend_until = new DateTime($attributes['suspendUntil']);
+            $user->suspend_until = $attributes['suspendUntil']
+                ? new DateTime($attributes['suspendUntil'])
+                : null;
         }
     }
 }
diff --git a/extensions/suspend/src/SuspendValidator.php b/extensions/suspend/src/SuspendValidator.php
index 761c0b9e1..1b58684bf 100644
--- a/extensions/suspend/src/SuspendValidator.php
+++ b/extensions/suspend/src/SuspendValidator.php
@@ -19,6 +19,6 @@ class SuspendValidator extends AbstractValidator
      * {@inheritdoc}
      */
     protected $rules = [
-        'suspendUntil' => ['date'],
+        'suspendUntil' => ['nullable', 'date'],
     ];
 }