diff --git a/drivers/sensors/navigator_trackpad.c b/drivers/sensors/navigator_trackpad.c
index be888a2c98..c0db6ca3a5 100644
--- a/drivers/sensors/navigator_trackpad.c
+++ b/drivers/sensors/navigator_trackpad.c
@@ -391,9 +391,26 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
         // Check if velocity is too low to continue
         int16_t abs_vx = scroll_inertia.vx < 0 ? -scroll_inertia.vx : scroll_inertia.vx;
         int16_t abs_vy = scroll_inertia.vy < 0 ? -scroll_inertia.vy : scroll_inertia.vy;
+
+#    ifdef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
+        // In macOS mode, track consecutive frames with no output to detect janky tail
+        if (scroll_x == 0 && scroll_y == 0) {
+            scroll_inertia.no_output_count++;
+        } else {
+            scroll_inertia.no_output_count = 0;
+        }
+
+        // Stop if: velocity very low OR too many consecutive frames without output
+        bool velocity_too_low = (abs_vx < 64 && abs_vy < 64);  // Same as hi-res mode
+        bool stalled = (scroll_inertia.no_output_count > 5);    // 5 frames (~35ms) with no output
+        if (velocity_too_low || stalled) {
+            scroll_inertia.active = false;
+        } else {
+#    else
         if (abs_vx < 64 && abs_vy < 64) {  // Threshold in Q8 (0.25 in real units)
             scroll_inertia.active = false;
         } else {
+#    endif
             // Apply scroll inversion if configured
 #    ifdef NAVIGATOR_SCROLL_INVERT_X
             mouse_report.h = -scroll_x;
@@ -407,6 +424,9 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
 #    endif
             return mouse_report;
         }
+#    ifndef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
+        }
+#    endif
     }
 #    endif
 #endif
@@ -447,6 +467,9 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
         scroll_inertia.active    = false;
         scroll_inertia.smooth_vx = 0;
         scroll_inertia.smooth_vy = 0;
+#        ifdef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
+        scroll_inertia.no_output_count = 0;
+#        endif
 #    endif
 #    ifdef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
         // Reset macOS scroll accumulator when starting new gesture
diff --git a/drivers/sensors/navigator_trackpad.h b/drivers/sensors/navigator_trackpad.h
index cde7b45319..c44c22b4b4 100644
--- a/drivers/sensors/navigator_trackpad.h
+++ b/drivers/sensors/navigator_trackpad.h
@@ -134,6 +134,9 @@ typedef struct {
     int16_t  smooth_vy;    // Smoothed Y velocity (Q8 fixed point)
     uint16_t timer;        // Timer for interval tracking
     bool     active;       // Is glide currently active
+#ifdef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
+    uint8_t  no_output_count; // Counter for consecutive frames with no output
+#endif
 } scroll_inertia_t;
 #endif