diff --git a/packages/flutter_timeline/lib/src/flutter_timeline_navigator_userstory.dart b/packages/flutter_timeline/lib/src/flutter_timeline_navigator_userstory.dart
index fb68a2f..1f42035 100644
--- a/packages/flutter_timeline/lib/src/flutter_timeline_navigator_userstory.dart
+++ b/packages/flutter_timeline/lib/src/flutter_timeline_navigator_userstory.dart
@@ -97,19 +97,21 @@ class _FlutterTimelineNavigatorUserstoryState
         options: widget.options,
         onTapCreatePost: (post) async {
           await widget.options.onTapCreatePostInOverview?.call(post) ??
-              await _pushAndRemoveUntil(_timelineScreenWidget());
+              _pushAndRemoveUntil(_timelineScreenWidget());
         },
       );
 
   Future<void> _push(Widget screen) async {
-    await Navigator.of(context)
-        .push(MaterialPageRoute(builder: (context) => screen));
-  }
-
-  Future<void> _pushAndRemoveUntil(Widget screen) async {
-    await Navigator.of(context).pushAndRemoveUntil(
-      MaterialPageRoute(builder: (context) => screen),
-      (route) => route.isFirst,
+    await Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (context) => screen,
+        settings: const RouteSettings(arguments: "popForOverview"),
+      ),
     );
   }
+
+  void _pushAndRemoveUntil(Widget screen) {
+    Navigator.of(context)
+        .popUntil((route) => route.settings.arguments != "popForOverview");
+  }
 }