diff --git a/hugvey/story.py b/hugvey/story.py
index c4fa31a..156ee85 100644
--- a/hugvey/story.py
+++ b/hugvey/story.py
@@ -535,10 +535,7 @@ class Diversion(object):
             
             story.logger.info(f"Diverge: No response {self.id} {story.stats}")
             
-            # fall back to the next message to return on.
-            # TODO: maybe, if not chapter is found, the diversion should be
-            # blocked alltogether?
-            self.returnMessage = story.getNextChapterForMsg(msgTo) or msgTo
+            self.returnMessage = msgTo
             
             await story.setCurrentMessage(msg)
             story.currentDiversion = self
@@ -586,10 +583,7 @@ class Diversion(object):
             story.logger.critical(f"Not a valid message id for diversion: {self.params['msgId']}")
             return
         
-        # fall back to the next message to return on.
-        # TODO: maybe, if not chapter is found, the diversion should be
-        # blocked alltogether?
-        self.returnMessage = story.getNextChapterForMsg(msgTo) or msgTo
+        self.returnMessage = msgTo
         await story.setCurrentMessage(msg)
         story.currentDiversion = self
         return True