diff --git a/moonstreamapi/moonstreamapi/actions.py b/moonstreamapi/moonstreamapi/actions.py
index 183f6f5b..f2d6a100 100644
--- a/moonstreamapi/moonstreamapi/actions.py
+++ b/moonstreamapi/moonstreamapi/actions.py
@@ -607,19 +607,42 @@ def create_seer_subscription(
 
 def delete_seer_subscription(
     db_session: Session,
-    user_id: uuid.UUID,
     subscription_id,
 ) -> None:
     """
     Delete seer subscription from db
+    If there are no more subscriptions for this address,abi_selector delete all abis
     """
 
-    db_session.query(AbiJobs).filter(
-        AbiJobs.user_id == user_id,
-        AbiJobs.subscription_id == subscription_id,
-    ).delete()
+    ## Delete subscription from db
 
-    db_session.commit()
+    try:
+        db_session.query(AbiSubscriptions).filter(
+            AbiSubscriptions.subscription_id == subscription_id
+        ).delete(synchronize_session=False)
+        db_session.commit()
+    except Exception as e:
+        logger.error(f"Error delete subscription from db: {str(e)}")
+        db_session.rollback()
+
+    not_connected_abi_jobs = (
+        db_session.query(AbiJobs)
+        .join(AbiSubscriptions, AbiJobs.id == AbiSubscriptions.abi_job_id, isouter=True)
+        .filter(AbiSubscriptions.subscription_id == None)
+        .cte("not_connected_abi_jobs")
+    )
+
+    ## Delete abi jobs from db
+
+    try:
+        db_session.query(AbiJobs).filter(
+            AbiJobs.id.in_(db_session.query(not_connected_abi_jobs.c.id))
+        ).delete(synchronize_session=False)
+
+        db_session.commit()
+    except Exception as e:
+        logger.error(f"Error delete abi jobs from db: {str(e)}")
+        db_session.rollback()
 
 
 def add_abi_to_db(
@@ -718,13 +741,27 @@ def add_abi_to_db(
     try:
         # Insert ABI jobs
         if abis_to_insert:
-            db_session.bulk_save_objects(abis_to_insert)
-            db_session.flush()  # Ensure the ABI job IDs are generated
+
+            insert_stmt = (
+                insert(AbiJobs)
+                .values([abi_job.__dict__ for abi_job in abis_to_insert])
+                .on_conflict_do_nothing(
+                    index_elements=["address", "chain", "abi_selector"]
+                )
+            )
+            db_session.execute(insert_stmt)
 
         # Insert corresponding subscriptions
         if subscriptions_to_insert:
 
-            db_session.bulk_insert_mappings(AbiSubscriptions, subscriptions_to_insert)
+            insert_stmt = (
+                insert(AbiSubscriptions)
+                .values(subscriptions_to_insert)
+                .on_conflict_do_nothing(
+                    index_elements=["abi_job_id", "subscription_id"]
+                )
+            )
+            db_session.execute(insert_stmt)
 
         db_session.commit()
     except Exception as e:
diff --git a/moonstreamapi/moonstreamapi/routes/subscriptions.py b/moonstreamapi/moonstreamapi/routes/subscriptions.py
index 1f0fa6a8..ee36d64b 100644
--- a/moonstreamapi/moonstreamapi/routes/subscriptions.py
+++ b/moonstreamapi/moonstreamapi/routes/subscriptions.py
@@ -302,7 +302,6 @@ async def delete_subscription_handler(
 
     delete_seer_subscription(
         db_session=db_session,
-        user_id=user.id,
         subscription_id=subscription_id,
     )