diff --git a/docs/3.x.x/en/configurations/configurations.md b/docs/3.x.x/en/configurations/configurations.md
index 56a2ba4d51..7b95079722 100644
--- a/docs/3.x.x/en/configurations/configurations.md
+++ b/docs/3.x.x/en/configurations/configurations.md
@@ -339,6 +339,7 @@ Most of the application's configurations are defined by environment. It means th
  - [`cron`](https://en.wikipedia.org/wiki/Cron)
   - `enabled` (boolean): Enable or disable CRON tasks to schedule jobs at specific dates. Default value: `false`.
  - `admin`
+  - `autoOpen` (boolean): Enable or disabled administration opening on start (default: `true`)
   - `path` (string): Allow to change the URL to access the admin (default: `/admin`).
   - `build`
     - `host` (string): URL to access the admin panel (default: `http://localhost:1337/admin`).
diff --git a/packages/strapi/lib/Strapi.js b/packages/strapi/lib/Strapi.js
index eef50a086a..4965d0ce7b 100755
--- a/packages/strapi/lib/Strapi.js
+++ b/packages/strapi/lib/Strapi.js
@@ -136,7 +136,7 @@ class Strapi extends EventEmitter {
           cb();
         }
 
-        if (this.config.environment === 'development') {
+        if (this.config.environment === 'development' && get(this.config.currentEnvironment, 'server.admin.autoOpen', true) !== false) {
           utils.openBrowser.call(this);
         }
       });