diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index ca8ebd4eed6fdb18f39b736c466c88733ce2b5fb..61f52786f48594e3182c6101a1be305672e17def 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -161,8 +161,6 @@ auto Transaction::RetrieveById(const std::string &id) noexcept -> StatusCode {
   return this->status.GetCode();
 }
 
-// TODO(fspreck) What about count queries (mixed with retrievals),
-// what about unique queries?
 auto Transaction::Query(const std::string &query) noexcept -> StatusCode {
   ASSERT_CAN_ADD_QUERY
 
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 86d3294e13166867ef7a409f9ceb7513753d6bae..6e04976d7d203e29c0ba084896e2f897c6121d48 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -177,4 +177,16 @@ TEST(test_transaction, test_update_entity) {
   EXPECT_EQ(error, StatusCode::ORIGINAL_ENTITY_MISSING_ID);
 }
 
+TEST(test_transaction, test_multi_deletion) {
+  const auto *host = "localhost";
+  auto configuration = InsecureConnectionConfiguration(host, 8000);
+  Connection connection(configuration);
+  auto transaction = connection.CreateTransaction();
+  EXPECT_EQ(transaction.GetStatus().GetCode(), StatusCode::INITIAL);
+  for (int i = 0; i < 3; i++) {
+    auto status = transaction->DeleteById("asdf");
+    EXPECT_EQ(status, StatusCode::GO_ON);
+  }
+}
+
 } // namespace caosdb::transaction