diff --git a/administrator/components/com_wrapper/services/provider.php b/administrator/components/com_wrapper/services/provider.php
new file mode 100644
index 0000000000000..f9b9d2bb07f1b
--- /dev/null
+++ b/administrator/components/com_wrapper/services/provider.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The wrapper service provider.
+ *
+ * @since  4.0.0
+ */
+return new class implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function register(Container $container)
+	{
+		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Wrapper'));
+		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Wrapper'));
+		$container->set(
+			ComponentInterface::class,
+			function (Container $container)
+			{
+				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+
+				return $component;
+			}
+		);
+	}
+};
diff --git a/components/com_wrapper/dispatcher.php b/components/com_wrapper/dispatcher.php
deleted file mode 100644
index 6b6d718a83879..0000000000000
--- a/components/com_wrapper/dispatcher.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  com_wrapper
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Dispatcher\Dispatcher;
-
-/**
- * Dispatcher class for com_wrapper
- *
- * @since  4.0.0
- */
-class WrapperDispatcher extends Dispatcher
-{
-	/**
-	 * The extension namespace
-	 *
-	 * @var    string
-	 *
-	 * @since  4.0.0
-	 */
-	protected $namespace = 'Joomla\\Component\\Wrapper';
-}