diff --git a/Neos.Flow/Classes/Command/ResourceCommandController.php b/Neos.Flow/Classes/Command/ResourceCommandController.php
index dcb2ec7b95..fd92235b17 100644
--- a/Neos.Flow/Classes/Command/ResourceCommandController.php
+++ b/Neos.Flow/Classes/Command/ResourceCommandController.php
@@ -279,7 +279,6 @@ public function cleanCommand()
                             $resource->getCollectionName()
                         ]);
                         $resource->disableLifecycleEvents();
-                        $this->resourceRepository->remove($resource);
                         if ($mediaPackagePresent && $assetRepository !== null && $thumbnailRepository !== null) {
                             if (isset($relatedAssets[$resource])) {
                                 foreach ($relatedAssets[$resource] as $asset) {
@@ -294,6 +293,7 @@ public function cleanCommand()
                                 }
                             }
                         }
+                        $this->resourceRepository->remove($resource);
                         $this->persistenceManager->persistAll();
                     }
                     $brokenResourcesCounter = count($brokenResources);