diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index ad68a439..55321bc6 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -4864,9 +4864,14 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
     formvalues = {}
     form = SummaryStringForm()
 
-    tss,normp = dataprep.workout_rscore(row)
+    tss = row.rscore
+    normp = row.normp
+    normv = row.normv
+    normw = row.normw
 
-    normv,normw = dataprep.workout_normv(row,pp=8.0)
+    if tss == -1:
+        tss,normp = dataprep.workout_rscore(row)
+        normv,normw = dataprep.workout_normv(row,pp=8.0)
 
     work = int(normw)
     power = int(normp)