diff --git a/src/administrator/components/com_weblinks/script.php b/src/administrator/components/com_weblinks/script.php
index 8a00065..853a319 100644
--- a/src/administrator/components/com_weblinks/script.php
+++ b/src/administrator/components/com_weblinks/script.php
@@ -52,6 +52,7 @@ class Com_WeblinksInstallerScript
 			'/plugins/search/weblinks/weblinks.php',
 			'/plugins/finder/weblinks/weblinks.php',
 			'/plugins/editors-xtd/weblink/weblink.php',
+			'plugins/system/weblinks/weblinks.php',
 		];
 
 		$folders = [
diff --git a/src/plugins/system/weblinks/src/Extension/Weblinks.php b/src/plugins/system/weblinks/src/Extension/Weblinks.php
index a67f20c..e378804 100644
--- a/src/plugins/system/weblinks/src/Extension/Weblinks.php
+++ b/src/plugins/system/weblinks/src/Extension/Weblinks.php
@@ -81,7 +81,7 @@ final class Weblinks extends CMSPlugin implements SubscriberInterface
 	 *
 	 * @param   string  $extension  The extension requesting information.
 	 *
-	 * @return  array containing statistical information.
+	 * @return  void
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
@@ -89,14 +89,14 @@ final class Weblinks extends CMSPlugin implements SubscriberInterface
 	{
 		if (!ComponentHelper::isEnabled('com_weblinks'))
 		{
-			return [];
+			return;
 		}
 
 		[$extension] = $event->getArguments();
 
 		if (!in_array($extension, $this->supportedExtensions))
 		{
-			return [];
+			return;
 		}
 
 		$db       = $this->getDatabase();
@@ -108,7 +108,7 @@ final class Weblinks extends CMSPlugin implements SubscriberInterface
 
 		if (!$webLinks)
 		{
-			return [];
+			return;
 		}
 
 		$result   = $event->getArgument('result', []);
diff --git a/src/plugins/system/weblinks/weblinks.xml b/src/plugins/system/weblinks/weblinks.xml
index d922aed..77fce7d 100644
--- a/src/plugins/system/weblinks/weblinks.xml
+++ b/src/plugins/system/weblinks/weblinks.xml
@@ -9,9 +9,9 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>##VERSION##</version>
 	<description>PLG_SYSTEM_WEBLINKS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Weblinks</namespace>
 	<files>
-		<folder plugin="weblinks">services</folder>
-		<folder>src</folder>
+		##FILES##
 	</files>
 	<languages folder="language">
 		##LANGUAGE_FILES##