diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 779511d8..2f13b840 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1311,7 +1311,6 @@ def instroke_interactive_chart(df,metric, workout, spm_min, spm_max,
     if df.empty:
         return "", "No data in selection"
 
-
     df_pos = (df+abs(df))/2.
     df_min = -(-df+abs(-df))/2.
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 0a90e12f..549e76ff 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 6385e646..288614a2 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -3088,6 +3088,8 @@ def instroke_chart_interactive(request, id=0, analysis=0, userid=0):
         factor=factor,
         )
 
+    data = data.fillna(method='ffill').fillna(method='bfill')
+
 
     if metric == 'boat accelerator curve' and data.median().max() < 0.5:
         data = 9.81*data