diff --git a/classes/controller.php b/classes/controller.php
index 53fbf9f7..97c1ce53 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -695,6 +695,11 @@ class AdminController
             return;
         }
 
+        if (is_link(ROOT_DIR . 'index.php')) {
+            $this->admin->json_response = ['status' => 'error', 'message' => 'Cannot upgrade: Grav is symlinked. Please upgrade manually'];
+            return false;
+        }
+
         $result = \Grav\Plugin\Admin\Gpm::selfupgrade();
 
         if ($result) {
diff --git a/classes/gpm.php b/classes/gpm.php
index f64b36a3..ab39cd0c 100644
--- a/classes/gpm.php
+++ b/classes/gpm.php
@@ -173,7 +173,7 @@ class Gpm
         $file = self::_downloadSelfupgrade($update, $tmp);
 
         Installer::install($file, GRAV_ROOT,
-            ['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => false]);
+            ['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true]);
 
         $errorCode = Installer::lastErrorCode();
 
@@ -185,4 +185,4 @@ class Gpm
 
         return true;
     }
-}
\ No newline at end of file
+}