diff --git a/deploy/asapo_services/asap3.tfvars b/deploy/asapo_services/asap3.tfvars
index b9d17576097e140d4382fa3e07adb3680e357d60..0ec00f294e7a8a97c470a34693ca06f9ba53b686 100644
--- a/deploy/asapo_services/asap3.tfvars
+++ b/deploy/asapo_services/asap3.tfvars
@@ -21,7 +21,8 @@ receiver_dataserver_cache_size = 30 #gb
 receiver_receive_to_disk_threshold = 50 # mb
 receiver_dataserver_nthreads = 8
 receiver_network_modes = "tcp"
-receiver_kafka_enabled = true
+receiver_kafka_enabled = false
+receiver_kafka_metadata_broker_list = ""
 
 grafana_total_memory_size = 2000
 influxdb_total_memory_size = 2000
diff --git a/deploy/asapo_services/scripts/asapo.auto.tfvars.in b/deploy/asapo_services/scripts/asapo.auto.tfvars.in
index a063683c26d2faedca971efc567cc83e1ca4cb5f..334e7119a5480d0f1e9c439cf530b21aae90d2b3 100644
--- a/deploy/asapo_services/scripts/asapo.auto.tfvars.in
+++ b/deploy/asapo_services/scripts/asapo.auto.tfvars.in
@@ -68,4 +68,7 @@ alertmanager_port = 9093
 
 n_receivers = 1
 n_brokers = 1
-n_fts = 1
\ No newline at end of file
+n_fts = 1
+
+receiver_kafka_enabled = false
+receiver_kafka_metadata_broker_list = ""
diff --git a/receiver/src/request.cpp b/receiver/src/request.cpp
index 45f337bdb364a30ec6d0fc6e7ad3b39a433f68b2..35ee43bd5c7aec3aeee7f2c26c6e3e82f6005a5f 100644
--- a/receiver/src/request.cpp
+++ b/receiver/src/request.cpp
@@ -50,6 +50,7 @@ Error Request::PrepareDataBufferAndLockIfNeeded() {
     auto err = PrepareDataBufferFromCache();
     if (err) {
         log__->Warning(LogMessageWithFields(err).Append(RequestLog("", this)));
+        cache__ = nullptr;
         return PrepareDataBufferFromMemory();
     }
     return nullptr;