diff --git a/administrator/components/com_finder/src/Indexer/Adapter.php b/administrator/components/com_finder/src/Indexer/Adapter.php
index c67bb5e57e1a8..d7afc6e5191b0 100644
--- a/administrator/components/com_finder/src/Indexer/Adapter.php
+++ b/administrator/components/com_finder/src/Indexer/Adapter.php
@@ -634,7 +634,7 @@ protected function getListQuery($query = null)
      *
      * @param   integer  $id  The plugin ID
      *
-     * @return  string  The plugin type
+     * @return  string|null  The plugin type
      *
      * @since   2.5
      */
@@ -644,6 +644,7 @@ protected function getPluginType($id)
         $query = $this->db->getQuery(true)
             ->select($this->db->quoteName('element'))
             ->from($this->db->quoteName('#__extensions'))
+            ->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('finder'))
             ->where($this->db->quoteName('extension_id') . ' = ' . (int) $id);
         $this->db->setQuery($query);
 
@@ -878,6 +879,8 @@ protected function pluginDisable($pks)
                 foreach ($items as $item) {
                     $this->remove($item);
                 }
+                // Stop processing plugins
+                break;
             }
         }
     }