diff --git a/cmd/metadata/custom_hasura_config/1_partner_role.json b/cmd/metadata/custom_hasura_config/1_partner_role.json
index ab777a7..3375544 100644
--- a/cmd/metadata/custom_hasura_config/1_partner_role.json
+++ b/cmd/metadata/custom_hasura_config/1_partner_role.json
@@ -43,6 +43,7 @@
             "filter": {
               "_and": [
                 { "contract": { "_eq": "X-Hasura-User-Id" } },
+                { "token_id": { "_is_null": "false"} },
                 { "status": { "_neq": 1 } },
                 { "expired": { "_eq": "true" } }
               ]
diff --git a/cmd/metadata/custom_hasura_config/2_invalidate_endpoint.json b/cmd/metadata/custom_hasura_config/2_invalidate_endpoint.json
index a66f037..866a09c 100644
--- a/cmd/metadata/custom_hasura_config/2_invalidate_endpoint.json
+++ b/cmd/metadata/custom_hasura_config/2_invalidate_endpoint.json
@@ -8,7 +8,7 @@
         "args": {
           "collection_name": "allowed-queries",
           "query_name": "Invalidate token metadata",
-          "query": "mutation Invalidate($contract: String) {\n  update_token_metadata(\n    where: {\n      contract: {_eq: $contract}, \n      status: {_neq: \"1\"}, \n      expired: {_eq: true}\n    }, \n    _set: {\n      status: \"1\", \n      retry_count: \"0\"\n    }) {\n    \taffected_rows\n  }\n}"
+          "query": "mutation Invalidate($contract: String, $token_id: numeric = 0) {\n  update_token_metadata(\n    where: {\n      contract: {_eq: $contract}, \n      token_id: {_eq: $token_id}, \n      status: {_neq: \"1\"}, \n      expired: {_eq: true}\n    }, \n    _set: {\n      status: \"1\", \n      retry_count: \"0\"\n    }) {\n    \taffected_rows\n  }\n}"
         }
       },
       {