diff --git a/admin/starter/composer.json b/admin/starter/composer.json
index f2959dd49b51..026329ca9a24 100644
--- a/admin/starter/composer.json
+++ b/admin/starter/composer.json
@@ -17,10 +17,6 @@
         "ext-fileinfo": "Improves mime type detection for files"
     },
     "autoload": {
-        "psr-4": {
-            "App\\": "app",
-            "Config\\": "app/Config"
-        },
         "exclude-from-classmap": [
             "**/Database/Migrations/**"
         ]
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index 3f84f33d918f..d153b3aa857a 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -76,6 +76,10 @@ public function getCommands()
     /**
      * Discovers all commands in the framework and within user code,
      * and collects instances of them to work with.
+     *
+     * @TODO this approach (find qualified classname from path) causes error,
+     *      when using Composer autoloader.
+     *      See https://github.com/codeigniter4/CodeIgniter4/issues/5818
      */
     public function discoverCommands()
     {