diff --git a/app/Composers/ThemeComposer.php b/app/Composers/ThemeComposer.php
index 6e5dc1704..78d6a258e 100644
--- a/app/Composers/ThemeComposer.php
+++ b/app/Composers/ThemeComposer.php
@@ -25,8 +25,8 @@ class ThemeComposer
      */
     public function compose(View $view)
     {
-        $view->with('themeBackgroundColor', Setting::get('style_background_color') ?: null);
-        $view->with('themeTextColor', Setting::get('style_text_color') ?: null);
+        $view->with('themeBackgroundColor', Setting::get('style_background_color'));
+        $view->with('themeTextColor', Setting::get('style_text_color'));
 
         $viewData = $view->getData();
         $themeView = array_only($viewData, preg_grep('/^theme/', array_keys($viewData)));
diff --git a/app/Config/Repository.php b/app/Config/Repository.php
index 1e4b1c7ae..29eab6536 100644
--- a/app/Config/Repository.php
+++ b/app/Config/Repository.php
@@ -45,11 +45,12 @@ class Repository
      * Returns a setting from the database.
      *
      * @param string $name
+     * @param string $default
      * @param bool   $checkEnv
      *
      * @return string|null
      */
-    public function get($name, $checkEnv = true)
+    public function get($name, $default = null, $checkEnv = true)
     {
         // if we've not loaded the settings, load them now
         if (!$this->settings) {
@@ -65,6 +66,8 @@ class Repository
         if ($checkEnv) {
             return $this->settings[$name] = env(strtoupper($name));
         }
+
+        return $default;
     }
 
     /**
diff --git a/app/Http/helpers.php b/app/Http/helpers.php
index 59fad44f4..e6758790e 100644
--- a/app/Http/helpers.php
+++ b/app/Http/helpers.php
@@ -142,7 +142,7 @@ if (!function_exists('formatted_date')) {
      */
     function formatted_date($date)
     {
-        $dateFormat = Setting::get('date_format') ?: 'jS F Y';
+        $dateFormat = Setting::get('date_format', 'jS F Y');
 
         return (new Date($date))->format($dateFormat);
     }