diff --git a/.env.example b/.env.example
index 29286f6fa3..c628064094 100755
--- a/.env.example
+++ b/.env.example
@@ -38,7 +38,6 @@ SEND_REGISTRATION_MAIL=true
 MUST_CONFIRM_ACCOUNT=false
 
 SHOW_INCOMPLETE_TRANSLATIONS=false
-SHOW_DEMO_WARNING=false
 
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index ef6f6d02ee..f949166e88 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -119,7 +119,7 @@ class RegisterController extends Controller
      */
     public function showRegistrationForm(Request $request)
     {
-        $showDemoWarning = env('SHOW_DEMO_WARNING', false);
+        $showDemoWarning = config('firefly.show-demo-warning', false);
 
         // is allowed to?
         $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
diff --git a/config/firefly.php b/config/firefly.php
index 8986cc2270..c7a5bcf155 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -188,4 +188,5 @@ return [
     ],
     'default_currency'         => 'EUR',
     'default_language'         => 'en_US',
+    'show-demo-warning'        => false,
 ];