diff --git a/package/lib/src/beamer_delegate.dart b/package/lib/src/beamer_delegate.dart
index 38ed3c87..c9091642 100644
--- a/package/lib/src/beamer_delegate.dart
+++ b/package/lib/src/beamer_delegate.dart
@@ -74,7 +74,7 @@ class BeamerDelegate extends RouterDelegate<RouteInformation>
   /// `*App.router` and at least one more [Beamer] in the Widget tree.
   BeamerDelegate? get parent => _parent;
   set parent(BeamerDelegate? parent) {
-    if(parent == null && _parent != null) {
+    if (parent == null && _parent != null) {
       _parent!.removeListener(_updateFromParent);
       _parent!._children.remove(this);
       _parent = null;
@@ -609,6 +609,7 @@ class BeamerDelegate extends RouterDelegate<RouteInformation>
       } else {
         beamingHistory.last.history
             .removeRange(index, beamingHistory.last.history.length);
+        break;
       }
     }
     beamToNamed(