diff --git a/libraries/src/Client/FtpClient.php b/libraries/src/Client/FtpClient.php
index 9d85bd265aa98..e133f5c553a5a 100644
--- a/libraries/src/Client/FtpClient.php
+++ b/libraries/src/Client/FtpClient.php
@@ -154,10 +154,7 @@ public function __construct(array $options = array())
 		if (FTP_NATIVE)
 		{
 			// Import the generic buffer stream handler
-			\JLoader::import('joomla.utilities.buffer');
-
-			// Autoloading fails for JBuffer as the class is used as a stream handler
-			\JLoader::load('JBuffer');
+			class_exists('\\Joomla\\CMS\\Utility\\BufferStreamHandler');
 		}
 	}