diff --git a/src/data_handler.ts b/src/data_handler.ts
index b478a0ca760b655b2f860859494165a865ac72c6..28023c63e66f26e3da2f0cac119f72ebbfee2725 100644
--- a/src/data_handler.ts
+++ b/src/data_handler.ts
@@ -331,8 +331,10 @@ export class DataHandler {
     // Process remove smith cert
     for (const smithCertRemoved of newData.smithCertRemoved) {
       const { issuerId, receiverId } = smithCertRemoved;
-
-      this.data.smithCert.delete([issuerId, receiverId]);
+      const smithCert = await ctx.store.findOneOrFail(SmithCert, {
+        where: { issuer: { index: issuerId }, receiver: { index: receiverId } },
+      });
+      await ctx.store.remove(smithCert);
     }
 
     // Process Smith invitation sent