diff --git a/waku/waku_archive/driver/postgres_driver/postgres_driver.nim b/waku/waku_archive/driver/postgres_driver/postgres_driver.nim
index 4877cb126..2f495ba5d 100644
--- a/waku/waku_archive/driver/postgres_driver/postgres_driver.nim
+++ b/waku/waku_archive/driver/postgres_driver/postgres_driver.nim
@@ -1347,8 +1347,10 @@ proc removePartition(
   (await self.performWriteQuery(detachPartitionQuery)).isOkOr:
     info "detected error when trying to detach partition", error
 
-    if ($error).contains("FINALIZE") or
-        ($error).contains("already pending detach in part"):
+    if ($error).contains("FINALIZE") or ($error).contains("already pending"):
+      ## We assume "already pending detach in partitioned table ..." as possible error
+      debug "enforce detach with FINALIZE because of detected error", error
+
       ## We assume the database is suggesting to use FINALIZE when detaching a partition
       let detachPartitionFinalizeQuery =
         "ALTER TABLE messages DETACH PARTITION " & partitionName & " FINALIZE;"