diff --git a/include/ccaosdb.h b/include/ccaosdb.h
index 245d9615fef23b5dbc863e72f65c287b92c768d2..fb21d00f443380758226e281f7ab3c6558bf6b58 100644
--- a/include/ccaosdb.h
+++ b/include/ccaosdb.h
@@ -251,6 +251,8 @@ int caosdb_transaction_transaction_retrieve_by_id(
   caosdb_transaction_transaction *transaction, const char *id);
 int caosdb_transaction_transaction_retrieve_by_ids(
   caosdb_transaction_transaction *transaction, const char *ids[]);
+int caosdb_transaction_transaction_query(
+  caosdb_transaction_transaction *transaction, const char *query);
 int caosdb_transaction_transaction_execute(
   caosdb_transaction_transaction *transaction);
 // TODO(fspreck) execute_asynchronously may be added as a separate
diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index 0b1c7df6ad24a4756a3cfaf3a5269591a277d18b..e847f614393c1a802698927e5a47d779dc5d6132 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -269,6 +269,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                         transaction->wrapped_transaction);
                     return wrapped_transaction->RetrieveById(std::string(id));
                   })
+
 ERROR_RETURN_CODE(
   GENERIC_ERROR,
   int caosdb_transaction_transaction_retrieve_by_ids(
@@ -284,6 +285,17 @@ ERROR_RETURN_CODE(
     return wrapped_transaction->RetrieveById(str_ids.begin(), str_ids.end());
   })
 
+ERROR_RETURN_CODE(GENERIC_ERROR,
+                  int caosdb_transaction_transaction_query(
+                    caosdb_transaction_transaction *transaction,
+                    const char *query),
+                  {
+                    auto *wrapped_transaction =
+                      static_cast<caosdb::transaction::Transaction *>(
+                        transaction->wrapped_transaction);
+                    return wrapped_transaction->Query(std::string(query));
+                  })
+
 ERROR_RETURN_CODE(GENERIC_ERROR,
                   int caosdb_transaction_transaction_execute(
                     caosdb_transaction_transaction *transaction),
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index ff05fa036519b6574d254195ef2b4d3f8d63f624..9d06acd88e2932d6edece61a046b4e7a90d75747 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -108,3 +108,17 @@ TEST_F(test_ccaosdb, test_multi_retrieve) {
     caosdb_transaction_transaction_retrieve_by_ids(&multi_transaction, ids));
   EXPECT_EQ(return_code, 0);
 }
+
+TEST_F(test_ccaosdb, test_query) {
+  caosdb_connection_connection connection;
+  caosdb_connection_connection_manager_get_connection(&connection,
+                                                      "local-caosdb-admin");
+
+  caosdb_transaction_transaction transaction;
+  caosdb_connection_connection_create_transaction(&connection,
+                                                  &transaction);
+
+  int return_code(caosdb_transaction_transaction_query(
+    &transaction, "FIND ENTITY WITH id=123"));
+  EXPECT_EQ(return_code, 0);
+}