diff --git a/backend-rust/.sqlx/query-f0f7f2fa035602d7d94db1248eb028efe2eb14d35b91bd73dfbd585880edb7e7.json b/backend-rust/.sqlx/query-a99ada7f03edda32713cdc4334e924fa6d7541609864a8b5d18166548011c99d.json
similarity index 76%
rename from backend-rust/.sqlx/query-f0f7f2fa035602d7d94db1248eb028efe2eb14d35b91bd73dfbd585880edb7e7.json
rename to backend-rust/.sqlx/query-a99ada7f03edda32713cdc4334e924fa6d7541609864a8b5d18166548011c99d.json
index 8da852eb..a38036c8 100644
--- a/backend-rust/.sqlx/query-f0f7f2fa035602d7d94db1248eb028efe2eb14d35b91bd73dfbd585880edb7e7.json
+++ b/backend-rust/.sqlx/query-a99ada7f03edda32713cdc4334e924fa6d7541609864a8b5d18166548011c99d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT * FROM (\n                SELECT \n                    index,\n                    block_height,\n                    hash,\n                    ccd_cost,\n                    energy_cost,\n                    sender_index,\n                    type as \"tx_type: DbTransactionType\",\n                    type_account as \"type_account: AccountTransactionType\",\n                    type_credential_deployment as \"type_credential_deployment: CredentialDeploymentTransactionType\",\n                    type_update as \"type_update: UpdateTransactionType\",\n                    success,\n                    events as \"events: sqlx::types::Json<Vec<Event>>\",\n                    reject as \"reject: sqlx::types::Json<TransactionRejectReason>\"\n                FROM transactions\n                WHERE transactions.sender_index = $5\n                AND index > $1 AND index < $2\n                AND type_account IN ('AddBaker', 'RemoveBaker', 'UpdateBakerStake', \n                    'UpdateBakerRestakeEarnings', 'UpdateBakerKeys', 'ConfigureBaker')\n                ORDER BY\n                    CASE WHEN NOT $3 THEN index END DESC,\n                    CASE WHEN $3 THEN index END ASC\n                LIMIT $4\n            ) ORDER BY index DESC",
+  "query": "\n            SELECT * FROM (\n                SELECT \n                    index,\n                    block_height,\n                    hash,\n                    ccd_cost,\n                    energy_cost,\n                    sender_index,\n                    type as \"tx_type: DbTransactionType\",\n                    type_account as \"type_account: AccountTransactionType\",\n                    type_credential_deployment as \"type_credential_deployment: CredentialDeploymentTransactionType\",\n                    type_update as \"type_update: UpdateTransactionType\",\n                    success,\n                    events as \"events: sqlx::types::Json<Vec<Event>>\",\n                    reject as \"reject: sqlx::types::Json<TransactionRejectReason>\"\n                FROM transactions\n                WHERE transactions.sender_index = $5\n                AND index > $1 AND index < $2\n                AND type_account = ANY($6)\n                ORDER BY\n                    CASE WHEN NOT $3 THEN index END DESC,\n                    CASE WHEN $3 THEN index END ASC\n                LIMIT $4\n            ) ORDER BY index DESC",
   "describe": {
     "columns": [
       {
@@ -157,7 +157,44 @@
         "Int8",
         "Bool",
         "Int8",
-        "Int8"
+        "Int8",
+        {
+          "Custom": {
+            "name": "account_transaction_type[]",
+            "kind": {
+              "Array": {
+                "Custom": {
+                  "name": "account_transaction_type",
+                  "kind": {
+                    "Enum": [
+                      "InitializeSmartContractInstance",
+                      "UpdateSmartContractInstance",
+                      "SimpleTransfer",
+                      "EncryptedTransfer",
+                      "SimpleTransferWithMemo",
+                      "EncryptedTransferWithMemo",
+                      "TransferWithScheduleWithMemo",
+                      "DeployModule",
+                      "AddBaker",
+                      "RemoveBaker",
+                      "UpdateBakerStake",
+                      "UpdateBakerRestakeEarnings",
+                      "UpdateBakerKeys",
+                      "UpdateCredentialKeys",
+                      "TransferToEncrypted",
+                      "TransferToPublic",
+                      "TransferWithSchedule",
+                      "UpdateCredentials",
+                      "RegisterData",
+                      "ConfigureBaker",
+                      "ConfigureDelegation"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
       ]
     },
     "nullable": [
@@ -176,5 +213,5 @@
       true
     ]
   },
-  "hash": "f0f7f2fa035602d7d94db1248eb028efe2eb14d35b91bd73dfbd585880edb7e7"
+  "hash": "a99ada7f03edda32713cdc4334e924fa6d7541609864a8b5d18166548011c99d"
 }
diff --git a/backend-rust/src/graphql_api/baker.rs b/backend-rust/src/graphql_api/baker.rs
index 5c4336de..a80dfa1d 100644
--- a/backend-rust/src/graphql_api/baker.rs
+++ b/backend-rust/src/graphql_api/baker.rs
@@ -166,7 +166,6 @@ impl Baker {
             before,
             config.transactions_per_block_connection_limit,
         )?;
-
         // Retrieves the transactions related to a baker account ('AddBaker',
         // 'RemoveBaker', 'UpdateBakerStake', 'UpdateBakerRestakeEarnings',
         // 'UpdateBakerKeys', 'ConfigureBaker'). The transactions are ordered in
@@ -194,8 +193,7 @@ impl Baker {
                 FROM transactions
                 WHERE transactions.sender_index = $5
                 AND index > $1 AND index < $2
-                AND type_account IN ('AddBaker', 'RemoveBaker', 'UpdateBakerStake', 
-                    'UpdateBakerRestakeEarnings', 'UpdateBakerKeys', 'ConfigureBaker')
+                AND type_account = ANY($6)
                 ORDER BY
                     CASE WHEN NOT $3 THEN index END DESC,
                     CASE WHEN $3 THEN index END ASC
@@ -205,7 +203,15 @@ impl Baker {
             query.to,
             query.desc,
             query.limit,
-            self.id.0
+            self.id.0,
+            &[
+                AccountTransactionType::AddBaker,
+                AccountTransactionType::RemoveBaker,
+                AccountTransactionType::UpdateBakerStake,
+                AccountTransactionType::UpdateBakerRestakeEarnings,
+                AccountTransactionType::UpdateBakerKeys,
+                AccountTransactionType::ConfigureBaker
+            ] as &[AccountTransactionType]
         )
         .fetch(pool);