diff --git a/planetmint/backend/tarantool/query.py b/planetmint/backend/tarantool/query.py
index 22e8bed..d2db699 100644
--- a/planetmint/backend/tarantool/query.py
+++ b/planetmint/backend/tarantool/query.py
@@ -391,10 +391,10 @@ def delete_transactions(connection, txn_ids: list):
 
 def store_pre_commit_state(state: dict, connection):
     space = connection.space("pre_commits")
-    # precommit = space.select(state["height"], index="height_search", limit=1)
-    # unique_id = token_hex(8) if (len(_precommit.data) == 0) else _precommit.data[0][0]
-    space.upsert((state["commit_id"], state["height"], state["transactions"]),
-                 op_list=[('=', 0, state["id"]),
+    _precommit = space.select(state["height"], index="height_search", limit=1)
+    unique_id = token_hex(8) if (len(_precommit.data) == 0) else _precommit.data[0][0]
+    space.upsert((unique_id, state["height"], state["transactions"]),
+                 op_list=[('=', 0, unique_id),
                           ('=', 1, state["height"]),
                           ('=', 2, state["transactions"])],
                  limit=1)
diff --git a/tests/backend/tarantool/test_queries.py b/tests/backend/tarantool/test_queries.py
index 862a729..cabd6ae 100644
--- a/tests/backend/tarantool/test_queries.py
+++ b/tests/backend/tarantool/test_queries.py
@@ -434,7 +434,7 @@ def test_store_pre_commit_state(db_context):
 
     query.store_pre_commit_state(connection=conn, state=state)
     commit = query.get_pre_commit_state(connection=conn)
-    assert len(list(commit)) == 1
+    assert len([commit]) == 1
 
     # cursor = db_context.conn.db.pre_commit.find({'commit_id': 'test'},
     # projection={'_id': False})