diff --git a/app/Config/Repository.php b/app/Config/Repository.php
index 785f9b7d..87c3a8e1 100644
--- a/app/Config/Repository.php
+++ b/app/Config/Repository.php
@@ -64,7 +64,9 @@ class Repository
 
         // fallback to getenv if allowed to
         if ($checkEnv) {
-            return $this->settings[$name] = env(strtoupper($name));
+            if ($this->settings[$name] = env(strtoupper($name))) {
+                return $this->settings[$name];
+            }
         }
 
         return $default;