diff --git a/markov/views.py b/markov/views.py
index ea7bd37..a5a5690 100644
--- a/markov/views.py
+++ b/markov/views.py
@@ -158,7 +158,8 @@ def _generate_line(context, topics=None, min_words=15, max_words=30):
         if len(line) >= min_words:
             return line
         else:
-            line[-1] += random.choice([',', '.', '!'])
+            if line[-1][-1] not in [',', '.', '!']:
+                line[-1] += random.choice([',', '.', '!'])
 
         tries += 1