diff --git a/src/aleph/chains/indexer_reader.py b/src/aleph/chains/indexer_reader.py
index 0a2a76f92..0fbfd81a7 100644
--- a/src/aleph/chains/indexer_reader.py
+++ b/src/aleph/chains/indexer_reader.py
@@ -51,7 +51,7 @@ def make_account_state_query(
     return """
 {
   state: accountState(
-    blockchain: %s
+    blockchain: "%s"
     account: %s
     type: %s
   ) {
@@ -95,7 +95,7 @@ def make_events_query(
 
     fields = "\n".join(model.__fields__.keys())
     params: Dict[str, Any] = {
-        "blockchain": blockchain.value,
+        "blockchain": f'"{blockchain.value}"',
         "limit": limit,
         "reverse": "false",
     }