diff --git a/src/nvim/spellsuggest.c b/src/nvim/spellsuggest.c
index bdac5aa587..efd647a5c3 100644
--- a/src/nvim/spellsuggest.c
+++ b/src/nvim/spellsuggest.c
@@ -1941,6 +1941,12 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char *fword, bool soun
       // - Skip the byte if it's equal to the byte in the word,
       //   accepting that byte is always better.
       n += sp->ts_curi++;
+
+      // break out, if we would be accessing byts buffer out of bounds
+      if (byts == slang->sl_fbyts && n >= slang->sl_fbyts_len) {
+        got_int = true;
+        break;
+      }
       c = byts[n];
       if (soundfold && sp->ts_twordlen == 0 && c == '*') {
         // Inserting a vowel at the start of a word counts less,
diff --git a/test/old/testdir/crash/poc_suggest_trie_walk b/test/old/testdir/crash/poc_suggest_trie_walk
new file mode 100644
index 0000000000..c79b6eeb5c
Binary files /dev/null and b/test/old/testdir/crash/poc_suggest_trie_walk differ
diff --git a/test/old/testdir/test_crash.vim b/test/old/testdir/test_crash.vim
index 11c5f4e014..eef1731454 100644
--- a/test/old/testdir/test_crash.vim
+++ b/test/old/testdir/test_crash.vim
@@ -135,6 +135,13 @@ func Test_crash1_2()
     \ '  && echo "crash 2: [OK]" >> '.. result .. "\<cr>")
   call TermWait(buf, 350)
 
+  let file = 'crash/poc_suggest_trie_walk'
+  let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
+  let args = printf(cmn_args, vim, file)
+  call term_sendkeys(buf, args ..
+    \ '  && echo "crash 3: [OK]" >> '.. result .. "\<cr>")
+  call TermWait(buf, 150)
+
   " clean up
   exe buf .. "bw!"
 
@@ -143,6 +150,7 @@ func Test_crash1_2()
   let expected = [
       \ 'crash 1: [OK]',
       \ 'crash 2: [OK]',
+      \ 'crash 3: [OK]',
       \ ]
 
   call assert_equal(expected, getline(1, '$'))