diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 2cc248b92a..3bf039fe26 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1806,15 +1806,8 @@ Session::xrun_recovery ()
 
 		}
 	}
-	else if (exporting ()) {
-		/* apparently JACK2 can cause xruns during freewheeling
-		 * (and not just one when switching from/to freewheeling):
-		 * https://discourse.ardour.org/t/there-have-been-dropouts-during-realtime-export/105930
-		 * https://github.com/jackaudio/jack2/issues/758
-		 */
-		if (realtime_export ()) {
-			++_export_xruns;
-		}
+	else if (_exporting && _realtime_export && _export_rolling) {
+		++_export_xruns;
 	}
 }