diff --git a/rowers/tasks.py b/rowers/tasks.py
index 96c400a2..a71f12b9 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -833,7 +833,7 @@ def cp_from_workoutids(workoutids,debug=False):
 
     if df.empty:
         # change this
-        return 2
+        return 0,0,0
 
     # df is not empty. We continue
     dfgrouped = df.groupby(['workoutid'])
@@ -909,19 +909,23 @@ def handle_updatefitnessmetric(user_id,mode,workoutids,debug=False,
     result = fitnessmetric_to_sql(mdict,debug=debug,doclean=False)
 
     powerfourmin,power2k,powerhour = cp_from_workoutids(workoutids,debug=debug)
+
+    if powerfourmin > 0 and power2k > 0 and powerhour > 0:
     
-    mdict = {
-        'user_id': user_id,
-        'PowerFourMin': powerfourmin,
-        'PowerTwoK': power2k,
-        'PowerOneHour': powerhour,
-        'workoutmode': mode,
-        'last_workout': max(workoutids),
-        'date': timezone.now().strftime('%Y-%m-%d'),
-             }
-
-    result = fitnessmetric_to_sql(mdict,debug=debug,doclean=True)
+        mdict = {
+            'user_id': user_id,
+            'PowerFourMin': powerfourmin,
+            'PowerTwoK': power2k,
+            'PowerOneHour': powerhour,
+            'workoutmode': mode,
+            'last_workout': max(workoutids),
+            'date': timezone.now().strftime('%Y-%m-%d'),
+        }
 
+        result = fitnessmetric_to_sql(mdict,debug=debug,doclean=True)
+    else:
+        result = 0
+        
     return result
 
 @app.task