diff --git a/administrator/components/com_finder/src/Indexer/Indexer.php b/administrator/components/com_finder/src/Indexer/Indexer.php
index 13a9823d724f..c2c6db473242 100644
--- a/administrator/components/com_finder/src/Indexer/Indexer.php
+++ b/administrator/components/com_finder/src/Indexer/Indexer.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Profiler\Profiler;
 use Joomla\Database\DatabaseInterface;
@@ -83,7 +82,7 @@ class Indexer
     /**
      * The indexer state object.
      *
-     * @var    CMSObject
+     * @var    \stdClass
      * @since  2.5
      */
     public static $state;
@@ -146,7 +145,7 @@ public function __construct(?DatabaseInterface $db = null)
     /**
      * Method to get the indexer state.
      *
-     * @return  CMSObject  The indexer state object.
+     * @return  \stdClass  The indexer state object.
      *
      * @since   2.5
      */
@@ -163,7 +162,7 @@ public static function getState()
 
         // If the state is empty, load the values for the first time.
         if (empty($data)) {
-            $data        = new CMSObject();
+            $data        = new \stdClass();
             $data->force = false;
 
             // Load the default configuration options.
@@ -228,7 +227,7 @@ public static function getState()
     /**
      * Method to set the indexer state.
      *
-     * @param   CMSObject  $data  A new indexer state object.
+     * @param   \stdClass  $data  A new indexer state object.
      *
      * @return  boolean  True on success, false on failure.
      *
@@ -237,7 +236,7 @@ public static function getState()
     public static function setState($data)
     {
         // Check the state object.
-        if (empty($data) || !$data instanceof CMSObject) {
+        if (empty($data) || !$data instanceof \stdClass) {
             return false;
         }
 
diff --git a/administrator/components/com_finder/src/Model/StatisticsModel.php b/administrator/components/com_finder/src/Model/StatisticsModel.php
index 8845712b15b5..04847c14d4e9 100644
--- a/administrator/components/com_finder/src/Model/StatisticsModel.php
+++ b/administrator/components/com_finder/src/Model/StatisticsModel.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -29,7 +28,7 @@ class StatisticsModel extends BaseDatabaseModel
     /**
      * Method to get the component statistics
      *
-     * @return  CMSObject The component statistics
+     * @return  \stdClass The component statistics
      *
      * @since   2.5
      */
@@ -38,7 +37,7 @@ public function getData()
         // Initialise
         $db    = $this->getDatabase();
         $query = $db->getQuery(true);
-        $data  = new CMSObject();
+        $data  = new \stdClass();
 
         $query->select('COUNT(term_id)')
             ->from($db->quoteName('#__finder_terms'));
diff --git a/administrator/components/com_finder/src/View/Statistics/HtmlView.php b/administrator/components/com_finder/src/View/Statistics/HtmlView.php
index 4c82a67e0c58..b1a41f65fbd7 100644
--- a/administrator/components/com_finder/src/View/Statistics/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Statistics/HtmlView.php
@@ -28,7 +28,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The index statistics
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var    \stdClass
      *
      * @since  3.6.1
      */