diff --git a/CHANGELOG.md b/CHANGELOG.md
index 857fe80cb..e876b4d02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # v1.7.0-beta.4
 ## 07/01/2019
 
+1. [](#improved)
+    * Better support for Symfony local server
+
+# v1.7.0-beta.4
+## 07/01/2019
+
 1. [](#new)
     * Updated with Grav 1.6.12 features, improvements & fixes
     * Added new configuration option `system.debugger.censored` to hide potentially sensitive information
diff --git a/index.php b/index.php
index 64154df89..633570274 100644
--- a/index.php
+++ b/index.php
@@ -16,8 +16,11 @@ if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     die(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
 }
 
-if (PHP_SAPI === 'cli-server' && !isset($_SERVER['PHP_CLI_ROUTER'])) {
-    die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+if (PHP_SAPI === 'cli-server') {
+    $symfony_server = strpos(getenv('_'), 'symfony') !== false;
+    if (!isset($_SERVER['PHP_CLI_ROUTER']) && !$symfony_server) {
+        die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+    }
 }
 
 // Ensure vendor libraries exist