diff --git a/changelogs/unreleased/gh-7584-missing-xlog-fix.md b/changelogs/unreleased/gh-7584-missing-xlog-fix.md
new file mode 100644
index 0000000000000000000000000000000000000000..39c199f54081190b72ea4e3b1853af743aecfcab
--- /dev/null
+++ b/changelogs/unreleased/gh-7584-missing-xlog-fix.md
@@ -0,0 +1,4 @@
+## bugfix/replication
+
+* Fixed master occasionally deleting xlogs needed by replicas even without a
+  restart (gh-7584).
diff --git a/src/box/wal.c b/src/box/wal.c
index 1fe290c92189a4daecc3ee4415f3d05afe15216d..19133c638186a79b9e4318dc28acb2263203c02e 100644
--- a/src/box/wal.c
+++ b/src/box/wal.c
@@ -794,7 +794,7 @@ wal_collect_garbage_f(struct cbus_call_msg *data)
 		 * required by registered consumers and delete all
 		 * older WAL files.
 		 */
-		vclock = vclockset_psearch(&writer->wal_dir.index, vclock);
+		vclock = vclockset_match(&writer->wal_dir.index, vclock);
 	}
 	if (vclock != NULL)
 		xdir_collect_garbage(&writer->wal_dir, vclock_sum(vclock),
diff --git a/src/lib/vclock/vclock.h b/src/lib/vclock/vclock.h
index 26ebe495af5b8fba5cb63dfb49a36b37f1bd7b41..60a598d6c5680195d2920a5b72c7611467b7ba58 100644
--- a/src/lib/vclock/vclock.h
+++ b/src/lib/vclock/vclock.h
@@ -432,7 +432,7 @@ rb_proto(, vclockset_, vclockset_t, struct vclock);
  * @return a vclock that <= than \a key
  */
 static inline struct vclock *
-vclockset_match(vclockset_t *set, struct vclock *key)
+vclockset_match(vclockset_t *set, const struct vclock *key)
 {
 	struct vclock *match = vclockset_psearch(set, key);
 	/**
diff --git a/test/replication-luatest/gh_7584_missing_xlog_test.lua b/test/replication-luatest/gh_7584_missing_xlog_test.lua
new file mode 100644
index 0000000000000000000000000000000000000000..d05b472f121617913c05b9b5f446e4b57d287de0
--- /dev/null
+++ b/test/replication-luatest/gh_7584_missing_xlog_test.lua
@@ -0,0 +1,48 @@
+local t = require('luatest')
+local cluster = require('test.luatest_helpers.cluster')
+local server = require('test.luatest_helpers.server')
+
+local g = t.group('gh-7584')
+
+g.before_all(function(cg)
+    cg.cluster = cluster:new{}
+    cg.master = cg.cluster:build_and_add_server{
+        alias = 'master',
+        box_cfg = {
+            checkpoint_count = 1,
+        },
+    }
+    cg.replica = cg.cluster:build_and_add_server{
+        alias = 'replica',
+        box_cfg = {
+            replication = {
+                server.build_instance_uri('master'),
+            },
+        },
+    }
+    cg.cluster:start()
+    cg.master:exec(function()
+        box.schema.space.create('loc', {is_local = true})
+        box.space.loc:create_index('pk')
+        box.schema.space.create('glob')
+        box.space.glob:create_index('pk')
+    end)
+end)
+
+g.after_all(function(cg)
+    cg.cluster:drop()
+end)
+
+g.test_xlog_gap = function(cg)
+    t.helpers.retrying({}, cg.replica.assert_follows_upstream, cg.replica, 1)
+    cg.replica:stop()
+    cg.master:exec(function()
+        for _ = 1, 2 do
+            box.space.loc:replace{1}
+            box.space.glob:replace{1}
+            box.snapshot()
+        end
+    end)
+    cg.replica:start()
+    t.helpers.retrying({}, cg.replica.assert_follows_upstream, cg.replica, 1)
+end