diff --git a/modules/cms/classes/ComponentManager.php b/modules/cms/classes/ComponentManager.php
index b38031586d..5388c53ac4 100644
--- a/modules/cms/classes/ComponentManager.php
+++ b/modules/cms/classes/ComponentManager.php
@@ -215,7 +215,7 @@ public function makeComponent($name, $cmsObject = null, $properties = [], $isSof
         }
 
         if (class_exists($className)) {
-            $component = App::make($className, [$cmsObject, $properties]);
+            $component = App::make($className, ['cmsObject' => $cmsObject, 'properties' => $properties]);
             $component->name = $name;
 
             return $component;
diff --git a/modules/cms/widgets/ComponentList.php b/modules/cms/widgets/ComponentList.php
index eda3c07a47..825be21186 100644
--- a/modules/cms/widgets/ComponentList.php
+++ b/modules/cms/widgets/ComponentList.php
@@ -88,7 +88,7 @@ protected function getData()
             foreach ($components as $componentInfo) {
                 $className = $componentInfo->className;
                 $alias = $componentInfo->alias;
-                $component = App::make($className, [null, []]);
+                $component = App::make($className);
 
                 if ($component->isHidden) {
                     continue;