diff --git a/app/components/WebsocketProvider.tsx b/app/components/WebsocketProvider.tsx
index b86eaafe9..d7cbbc8db 100644
--- a/app/components/WebsocketProvider.tsx
+++ b/app/components/WebsocketProvider.tsx
@@ -190,7 +190,6 @@ class WebsocketProvider extends React.Component<Props> {
                 documents.removeCollectionDocuments(collectionId);
                 memberships.removeCollectionMemberships(collectionId);
                 collections.remove(collectionId);
-                policies.remove(collectionId);
                 return;
               }
             }
@@ -305,7 +304,6 @@ class WebsocketProvider extends React.Component<Props> {
         documents.removeCollectionDocuments(collectionId);
         memberships.removeCollectionMemberships(collectionId);
         collections.remove(collectionId);
-        policies.remove(collectionId);
       })
     );
 
diff --git a/app/stores/base/Store.ts b/app/stores/base/Store.ts
index e29200407..bead0ff7c 100644
--- a/app/stores/base/Store.ts
+++ b/app/stores/base/Store.ts
@@ -123,6 +123,11 @@ export default abstract class Store<T extends Model> {
       }
     });
 
+    // Remove associated policies automatically, not defined through Relation decorator.
+    if (this.modelName !== "Policy") {
+      this.rootStore.policies.remove(id);
+    }
+
     this.data.delete(id);
   }