diff --git a/app/Utils/Traits/AppSetup.php b/app/Utils/Traits/AppSetup.php
index f60d31a093d7..8b7d80c21a81 100644
--- a/app/Utils/Traits/AppSetup.php
+++ b/app/Utils/Traits/AppSetup.php
@@ -131,7 +131,7 @@ trait AppSetup
         $words_count = count(explode(' ', trim($value)));
 
         if (is_null($position)) {
-            $env[] = "{$property}=" . $value . "\n"; // If we don't have entry for variable in the .env, write it.
+            $words_count > 1 ? $env[] = "{$property}=" . '"' . $value . '"' . "\n" : $env[] = "{$property}=" . $value . "\n";
         } else if ($words_count > 1) {
             $env[$position] = "{$property}=" . '"' . $value . '"' . "\n"; // If value of variable is more than one word, surround with quotes.
         } else {