diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php
index 039751ea..bae817de 100644
--- a/src/Controller/AdminPages/BaseAdminController.php
+++ b/src/Controller/AdminPages/BaseAdminController.php
@@ -24,6 +24,7 @@ namespace App\Controller\AdminPages;
 
 use App\DataTables\LogDataTable;
 use App\Entity\AssemblySystem\Assembly;
+use App\Entity\AssemblySystem\AssemblyBOMEntry;
 use App\Entity\Attachments\Attachment;
 use App\Entity\Attachments\AttachmentContainingDBElement;
 use App\Entity\Attachments\AttachmentUpload;
@@ -469,6 +470,10 @@ abstract class BaseAdminController extends AbstractController
                     return $this->redirectToRoute($this->route_base.'_edit', ['id' => $entity->getID()]);
                 }
             } else {
+                if ($entity instanceof Assembly) {
+                    $this->markReferencedBomEntry($entity);
+                }
+
                 if ($entity instanceof AbstractStructuralDBElement) {
                     $parent = $entity->getParent();
 
@@ -516,4 +521,16 @@ abstract class BaseAdminController extends AbstractController
 
         return $exporter->exportEntityFromRequest($entity, $request);
     }
+
+    private function markReferencedBomEntry(Assembly $referencedAssembly): void
+    {
+        $bomEntries = $this->entityManager->getRepository(AssemblyBOMEntry::class)->findBy(['referencedAssembly' => $referencedAssembly]);
+
+        foreach ($bomEntries as $entry) {
+            $entry->setReferencedAssembly(null);
+            $entry->setName($referencedAssembly->getName(). ' DELETED');
+
+            $this->entityManager->persist($entry);
+        }
+    }
 }