diff --git a/composer.json b/composer.json
index 65e0cdd050cc..0e43577568c0 100644
--- a/composer.json
+++ b/composer.json
@@ -20,8 +20,7 @@
     },
     "autoload": {
         "psr-4": {
-            "CodeIgniter\\": "system/",
-            "Psr\\Log\\": "system/ThirdParty/PSR/Log/"
+            "CodeIgniter\\": "system/"
         }
     },
     "scripts": {
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index 1ec59d0aeabc..d7d3f060baf4 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -157,10 +157,14 @@ public function __construct()
 			'CodeIgniter\HTTP\ResponseInterface'            => BASEPATH . 'HTTP/ResponseInterface.php',
 			'CodeIgniter\HTTP\URI'                          => BASEPATH . 'HTTP/URI.php',
 			'CodeIgniter\Log\Logger'                        => BASEPATH . 'Log/Logger.php',
+			'Psr\Log\AbstractLogger'                        => BASEPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
+			'Psr\Log\InvalidArgumentException'              => BASEPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
 			'Psr\Log\LoggerAwareInterface'                  => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
 			'Psr\Log\LoggerAwareTrait'                      => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
 			'Psr\Log\LoggerInterface'                       => BASEPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
+			'Psr\Log\LoggerTrait'                           => BASEPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
 			'Psr\Log\LogLevel'                              => BASEPATH . 'ThirdParty/PSR/Log/LogLevel.php',
+			'Psr\Log\NullLogger'                            => BASEPATH . 'ThirdParty/PSR/Log/NullLogger.php',
 			'CodeIgniter\Log\Handlers\BaseHandler'          => BASEPATH . 'Log/Handlers/BaseHandler.php',
 			'CodeIgniter\Log\Handlers\ChromeLoggerHandler'  => BASEPATH . 'Log/Handlers/ChromeLoggerHandler.php',
 			'CodeIgniter\Log\Handlers\FileHandler'          => BASEPATH . 'Log/Handlers/FileHandler.php',