diff --git a/cmd/api/handlers/context.go b/cmd/api/handlers/context.go
index 46d1ec34b..50010f708 100644
--- a/cmd/api/handlers/context.go
+++ b/cmd/api/handlers/context.go
@@ -36,7 +36,6 @@ func NewContext(cfg config.Config) (*Context, error) {
 		config.WithTzKTServices(cfg.TzKT),
 		config.WithLoadErrorDescriptions(),
 		config.WithConfigCopy(cfg),
-		config.WithRabbit(cfg.RabbitMQ, cfg.API.ProjectName, cfg.API.MQ),
 		config.WithPinata(cfg.API.Pinata),
 		config.WithTzipSchema("data/tzip-16-schema.json"),
 	)
diff --git a/configs/development.yml b/configs/development.yml
index e9602921e..d1504afa1 100644
--- a/configs/development.yml
+++ b/configs/development.yml
@@ -82,17 +82,6 @@ api:
     - mainnet
     - edo2net
     - florencenet
-  mq:
-    publisher: true
-    queues:
-      operations:
-        non_durable: true
-        auto_deleted: true
-        ttl_seconds: 10
-      blocks:
-        non_durable: true
-        auto_deleted: true
-        ttl_seconds: 10
   pinata:
     key: ${PINATA_KEY}
     secret_key: ${PINATA_SECRET_KEY}
diff --git a/configs/production.yml b/configs/production.yml
index d18e77b60..d593a33ce 100644
--- a/configs/production.yml
+++ b/configs/production.yml
@@ -83,17 +83,6 @@ api:
     - mainnet
     - edo2net
     - florencenet
-  mq:
-    publisher: true
-    queues:
-      operations:
-        non_durable: true
-        auto_deleted: true
-        ttl_seconds: 15
-      blocks:
-        non_durable: true
-        auto_deleted: true
-        ttl_seconds: 15
   pinata:
     key: ${PINATA_KEY}
     secret_key: ${PINATA_SECRET_KEY}
diff --git a/configs/sandbox.yml b/configs/sandbox.yml
index 8a1b0d5d4..9c1b174eb 100644
--- a/configs/sandbox.yml
+++ b/configs/sandbox.yml
@@ -63,15 +63,6 @@ api:
         network: "sandboxnet"
   networks:
     - sandboxnet
-  mq:
-    publisher: true
-    queues:
-      operations:
-        non_durable: true
-        auto_deleted: true
-      blocks:
-        non_durable: true
-        auto_deleted: true
   pinata:
     key: ${PINATA_KEY}
     secret_key: ${PINATA_SECRET_KEY}
diff --git a/configs/you.yml b/configs/you.yml
index bfc2252cc..7522b3c00 100644
--- a/configs/you.yml
+++ b/configs/you.yml
@@ -82,17 +82,6 @@ api:
     - mainnet
     - edo2net
     - florencenet
-  mq:
-    publisher: true
-    queues:
-      operations:
-        non_durable: true
-        auto_deleted: true
-        ttl_seconds: 10
-      blocks:
-        non_durable: true
-        auto_deleted: true
-        ttl_seconds: 10
   pinata:
     key: ${PINATA_KEY}
     secret_key: ${PINATA_SECRET_KEY}
diff --git a/internal/elastic/core/scroll.go b/internal/elastic/core/scroll.go
index 2f4f1cd2e..6651dae61 100644
--- a/internal/elastic/core/scroll.go
+++ b/internal/elastic/core/scroll.go
@@ -46,7 +46,7 @@ func (ctx *ScrollContext) createScroll(index string, query map[string]interface{
 		return
 	}
 
-	if ctx.Size < ctx.ChunkSize {
+	if ctx.Size < ctx.ChunkSize && ctx.Size > 0 {
 		ctx.ChunkSize = ctx.Size
 	}