diff --git a/modules/Markov.py b/modules/Markov.py
index 7721e66..cb05395 100644
--- a/modules/Markov.py
+++ b/modules/Markov.py
@@ -400,9 +400,12 @@ class Markov(Module):
                 key_hits = self._retrieve_chains_for_key(self.start1, self.start2, context_id)
                 gen_words.append(self._get_suitable_word_from_choices(key_hits, gen_words, min_size))
 
-                # new word 2
-                key_hits = self._retrieve_chains_for_key(self.start2, found_word, context_id)
-                gen_words.append(self._get_suitable_word_from_choices(key_hits, gen_words, min_size))
+                if gen_words[-1] == self.stop:
+                    break
+                else:
+                    # new word 2
+                    key_hits = self._retrieve_chains_for_key(self.start2, gen_words[-1], context_id)
+                    gen_words.append(self._get_suitable_word_from_choices(key_hits, gen_words, min_size))
 
         # chop off the seed data at the start
         gen_words = gen_words[2:]