diff --git a/Dockerfiles/agent2/alpine/docker-entrypoint.sh b/Dockerfiles/agent2/alpine/docker-entrypoint.sh
index c27bb2f3c..b3463fc85 100755
--- a/Dockerfiles/agent2/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/alpine/docker-entrypoint.sh
@@ -177,6 +177,7 @@ prepare_zbx_agent_config() {
         export ZBX_ENABLEPERSISTENTBUFFER=1
     else
         unset ZBX_ENABLEPERSISTENTBUFFER
+        unset ZBX_PERSISTENTBUFFERFILE
     fi
 
     if [ "${ZBX_ENABLESTATUSPORT,,}" == "true" ]; then
diff --git a/Dockerfiles/agent2/centos/docker-entrypoint.sh b/Dockerfiles/agent2/centos/docker-entrypoint.sh
index c27bb2f3c..b3463fc85 100755
--- a/Dockerfiles/agent2/centos/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/centos/docker-entrypoint.sh
@@ -177,6 +177,7 @@ prepare_zbx_agent_config() {
         export ZBX_ENABLEPERSISTENTBUFFER=1
     else
         unset ZBX_ENABLEPERSISTENTBUFFER
+        unset ZBX_PERSISTENTBUFFERFILE
     fi
 
     if [ "${ZBX_ENABLESTATUSPORT,,}" == "true" ]; then
diff --git a/Dockerfiles/agent2/ol/docker-entrypoint.sh b/Dockerfiles/agent2/ol/docker-entrypoint.sh
index c27bb2f3c..b3463fc85 100755
--- a/Dockerfiles/agent2/ol/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/ol/docker-entrypoint.sh
@@ -177,6 +177,7 @@ prepare_zbx_agent_config() {
         export ZBX_ENABLEPERSISTENTBUFFER=1
     else
         unset ZBX_ENABLEPERSISTENTBUFFER
+        unset ZBX_PERSISTENTBUFFERFILE
     fi
 
     if [ "${ZBX_ENABLESTATUSPORT,,}" == "true" ]; then
diff --git a/Dockerfiles/agent2/rhel/docker-entrypoint.sh b/Dockerfiles/agent2/rhel/docker-entrypoint.sh
index c27bb2f3c..b3463fc85 100755
--- a/Dockerfiles/agent2/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/rhel/docker-entrypoint.sh
@@ -177,6 +177,7 @@ prepare_zbx_agent_config() {
         export ZBX_ENABLEPERSISTENTBUFFER=1
     else
         unset ZBX_ENABLEPERSISTENTBUFFER
+        unset ZBX_PERSISTENTBUFFERFILE
     fi
 
     if [ "${ZBX_ENABLESTATUSPORT,,}" == "true" ]; then
diff --git a/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh b/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
index c27bb2f3c..b3463fc85 100755
--- a/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
@@ -177,6 +177,7 @@ prepare_zbx_agent_config() {
         export ZBX_ENABLEPERSISTENTBUFFER=1
     else
         unset ZBX_ENABLEPERSISTENTBUFFER
+        unset ZBX_PERSISTENTBUFFERFILE
     fi
 
     if [ "${ZBX_ENABLESTATUSPORT,,}" == "true" ]; then