diff --git a/lib/pg_repack.sql.in b/lib/pg_repack.sql.in
index eb42436..80bc2d4 100644
--- a/lib/pg_repack.sql.in
+++ b/lib/pg_repack.sql.in
@@ -190,7 +190,7 @@ CREATE VIEW repack.tables AS
          'INSERT INTO repack.table_' || R.oid || ' VALUES ($1.*)' AS sql_insert,
          'DELETE FROM repack.table_' || R.oid || ' WHERE ' || repack.get_compare_pkey(PK.indexrelid, '$1') AS sql_delete,
          'UPDATE repack.table_' || R.oid || ' SET ' || repack.get_assign(R.oid, '$2') || ' WHERE ' || repack.get_compare_pkey(PK.indexrelid, '$1') AS sql_update,
-         'DELETE FROM repack.log_' || R.oid || ' WHERE id <= $1' AS sql_pop
+         'DELETE FROM repack.log_' || R.oid || ' WHERE id = $1' AS sql_pop
     FROM pg_class R
          LEFT JOIN pg_class T ON R.reltoastrelid = T.oid
          LEFT JOIN repack.primary_keys PK
diff --git a/lib/repack.c b/lib/repack.c
index c2c128f..eae361a 100644
--- a/lib/repack.c
+++ b/lib/repack.c
@@ -282,13 +282,16 @@ repack_apply(PG_FUNCTION_ARGS)
 					plan_update = repack_prepare(sql_update, 2, &argtypes[1]);
 				execute_plan(SPI_OK_UPDATE, plan_update, &values[1], &nulls[1]);
 			}
+			/* Delete tuple in log.
+			 * XXX It would be a lot more efficient to perform
+			 *     this DELETE in bulk, but be careful to only
+			 *     delete log entries we have actually processed.
+			 */
+			if (plan_pop == NULL)
+			    plan_pop = repack_prepare(sql_pop, 1, argtypes);
+			execute_plan(SPI_OK_DELETE, plan_pop, values, nulls);
 		}
 
-		/* delete tuple in log */
-		if (plan_pop == NULL)
-			plan_pop = repack_prepare(sql_pop, 1, argtypes);
-		execute_plan(SPI_OK_DELETE, plan_pop, values, nulls);
-
 		SPI_freetuptable(tuptable);
 	}