diff --git a/plugins/catalog-backend/src/database/CommonDatabase.ts b/plugins/catalog-backend/src/database/CommonDatabase.ts
index bb0fed90a1..24e9fd3d5e 100644
--- a/plugins/catalog-backend/src/database/CommonDatabase.ts
+++ b/plugins/catalog-backend/src/database/CommonDatabase.ts
@@ -390,6 +390,10 @@ export class CommonDatabase implements Database {
   async removeLocation(txOpaque: unknown, id: string): Promise<void> {
     const tx = txOpaque as Knex.Transaction<any, any>;
 
+    await tx<DbEntitiesRow>('entities')
+      .where({ location_id: id })
+      .update({ location_id: null });
+
     const result = await tx<DbLocationsRow>('locations').where({ id }).del();
 
     if (!result) {