diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php
index df95d7651..903fec820 100644
--- a/app/Traits/DateTime.php
+++ b/app/Traits/DateTime.php
@@ -32,8 +32,10 @@ trait DateTime
 
         $chars = ['dash' => '-', 'slash' => '/', 'dot' => '.', 'comma' => ',', 'space' => ' '];
 
-        $date_format = setting('localisation.date_format', $default);
-        $date_separator = $chars[setting('localisation.date_separator', 'space')];
+        $date_format = (setting('localisation.date_format', $default)) ?? $default;
+
+        $char = (setting('localisation.date_separator', 'space')) ?? 'space';
+        $date_separator = $chars[$char];
 
         return str_replace(' ', $date_separator, $date_format);
     }