diff --git a/html/typo3conf/ext/ter_fe2/Classes/Controller/RegisterkeyController.php b/html/typo3conf/ext/ter_fe2/Classes/Controller/RegisterkeyController.php
index 609469e17780815cc63731c1dd522b593eebcff8..8dd3d5553718ba946cdde889b63db5212c6daba9 100644
--- a/html/typo3conf/ext/ter_fe2/Classes/Controller/RegisterkeyController.php
+++ b/html/typo3conf/ext/ter_fe2/Classes/Controller/RegisterkeyController.php
@@ -14,6 +14,7 @@ namespace T3o\TerFe2\Controller;
  * The TYPO3 project - inspiring people to share!
  */
 
+use ApacheSolrForTypo3\Solr\GarbageCollector;
 use ApacheSolrForTypo3\Solr\IndexQueue\Queue;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -225,11 +226,13 @@ class RegisterkeyController extends \T3o\TerFe2\Controller\AbstractTerBasedContr
         } elseif ((strtolower($extension->getFrontendUser()) == strtolower($GLOBALS['TSFE']->fe_user->user['username'])) || $this->securityRole->isAdmin()) {
             // Deleted in ter, then delete the key in the ter_fe2 extension table
             if ($this->terConnection->deleteExtensionKey($extension->getExtKey())) {
+                $extensionUid = $extension->getUid();
                 $this->extensionRepository->remove($extension);
-                // remove from index queue
+
+                // ext:solr garbage collector
                 if (ExtensionManagementUtility::isLoaded('solr')) {
-                    $indexQueue = GeneralUtility::makeInstance(Queue::class);
-                    $indexQueue->deleteItem('tx_terfe2_domain_model_extension', $extension->getUid());
+                    $garbageCollector = GeneralUtility::makeInstance(GarbageCollector::class);
+                    $garbageCollector->collectGarbage('tx_terfe2_domain_model_extension', $extensionUid);
                 }
                 $this->addFlashMessage(
                     '',