diff --git a/app/recorders/fitRecorder.js b/app/recorders/fitRecorder.js
index ebbf866a17..a4ee71cce6 100644
--- a/app/recorders/fitRecorder.js
+++ b/app/recorders/fitRecorder.js
@@ -1471,9 +1471,9 @@ export function createFITRecorder (config) {
       developerFieldValues.push({ developer_data_index: 0, field_num: 17, value: trackpoint.drivePeakHandleForceNormalizedPosition * 100 })
     }
 
-    if (trackpoint.forceCurve.length > 0 && trackpoint.forceCurve.length < 128) {
+    if (trackpoint.forceCurve.length > 0 && trackpoint.forceCurve.length <= Math.min(127, sessionData.maxForceCurvePointCount)) {
       const sampleInterval = trackpoint.driveLength / trackpoint.forceCurve.length
-      const paddedForceCurve = Array.from({ length: sessionData.maxForceCurvePointCount }, (_, i) => trackpoint.forceCurve[i] ?? '0')
+      const paddedForceCurve = Array.from({ length: Math.min(127, sessionData.maxForceCurvePointCount) }, (_, i) => trackpoint.forceCurve[i] ?? '0')
       developerFieldValues.push({ developer_data_index: 0, field_num: 90, value: 2 })
       developerFieldValues.push({ developer_data_index: 0, field_num: 91, value: sampleInterval * 10000 })
       developerFieldValues.push({ developer_data_index: 0, field_num: 92, value: trackpoint.forceCurve.length })