diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py
index 2a478053..de8cc5be 100644
--- a/rowers/views/apiviews.py
+++ b/rowers/views/apiviews.py
@@ -575,7 +575,7 @@ def strokedata_fit(request):
         return JsonResponse({
             "status": "error",
             "message": f"An error occurred while saving the FIT file: {str(e)}"
-        }, status=500)
+        }, status=400)
 
     try:
         # Parse the FIT file
@@ -585,7 +585,7 @@ def strokedata_fit(request):
             return JsonResponse({
                 "status": "error",
                 "message": f"An error occurred while parsing the FIT file: {str(e)}"
-            }, status=500)
+            }, status=422)
 
         rowdata = rowingdata(df=row.df)
 
@@ -601,6 +601,7 @@ def strokedata_fit(request):
             dologging('apilog.log','FIT error to get time')
             dologging('apilog.log',e)
             _ = myqueue(queuehigh, handle_sendemail_unrecognized, fit_filename, "fit parser")
+            return HttpResponse(status=422)
 
         w = Workout.objects.create(user=request.user.rower,
                                    duration=duration,