diff --git a/app/Console/Commands/PanelUpdate.php b/app/Console/Commands/PanelUpdate.php
index da528d27..57573b35 100644
--- a/app/Console/Commands/PanelUpdate.php
+++ b/app/Console/Commands/PanelUpdate.php
@@ -22,7 +22,7 @@ class PanelUpdate extends Command
             $this->line(' 更新数据库...');
             Artisan::call('migrate --force');
 
-            if (config('app.demo') && $this->confirm('检测到您在DEMO模式, 是否重置数据库?')) {
+            if (config('app.env') === 'demo' && $this->confirm('检测到您在DEMO模式, 是否重置数据库?')) {
                 Artisan::call('migrate:fresh --seed --force');
             }
 
diff --git a/app/Http/Controllers/Admin/SystemController.php b/app/Http/Controllers/Admin/SystemController.php
index 21e38a66..a8ef68c2 100644
--- a/app/Http/Controllers/Admin/SystemController.php
+++ b/app/Http/Controllers/Admin/SystemController.php
@@ -152,7 +152,7 @@ class SystemController extends Controller
         }
 
         // 演示环境禁止修改特定配置项
-        if (config('app.demo')) {
+        if (config('app.env') === 'demo') {
             $denyConfig = [
                 'website_url',
                 'is_captcha',
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 3c86289b..13109d8a 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -241,7 +241,7 @@ class UserController extends Controller
 
             // 非演示环境才可以修改管理员密码
             $password = $request->input('password');
-            if (! empty($password) && ! (config('app.demo') && $user->id === 1)) {
+            if (! empty($password) && (config('app.env') !== 'demo' || $user->id !== 1)) {
                 $data['password'] = $password;
             }
 
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index d9e58036..6c6f07f1 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -158,7 +158,7 @@ class UserController extends Controller
                 }
 
                 // 演示环境禁止改管理员密码
-                if ($user->id === 1 && config('app.demo')) {
+                if ($user->id === 1 && config('app.env') === 'demo') {
                     return Redirect::back()->withErrors(trans('auth.password.reset.error.demo'));
                 }
 
diff --git a/config/app.php b/config/app.php
index a13da1ef..4d81c5c7 100644
--- a/config/app.php
+++ b/config/app.php
@@ -43,7 +43,6 @@ return [
     */
 
     'debug' => (bool) env('APP_DEBUG', false),
-    'demo' => (bool) env('APP_DEMO', false),
 
     /*
     |--------------------------------------------------------------------------