diff --git a/src/py/flwr/server/superlink/state/sqlite_state.py b/src/py/flwr/server/superlink/state/sqlite_state.py
index f4f26095aa9d..f4e9365cc5db 100644
--- a/src/py/flwr/server/superlink/state/sqlite_state.py
+++ b/src/py/flwr/server/superlink/state/sqlite_state.py
@@ -280,9 +280,6 @@ def get_task_ins(
             raise AssertionError(msg)
 
         data: Dict[str, Union[str, int]] = {}
-        # Convert a uint64 value to sint64 for SQLite
-        sint64_node_id = uint64_to_sint64(node_id)
-        data["node_id"] = sint64_node_id
 
         if node_id is None:
             # Retrieve all anonymous Tasks
@@ -294,6 +291,10 @@ def get_task_ins(
                 AND   delivered_at = ""
             """
         else:
+            # Convert a uint64 value to sint64 for SQLite
+            sint64_node_id = uint64_to_sint64(node_id)
+            data["node_id"] = sint64_node_id
+
             # Retrieve all TaskIns for node_id
             query = """
                 SELECT task_id