diff --git a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutData.vue b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutData.vue
index 5b01b747..43865567 100644
--- a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutData.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutData.vue
@@ -24,7 +24,10 @@
       />
       <WorkoutRecord :workoutObject="workoutObject" recordType="FD" />
     </div>
-    <div class="workout-data">
+    <div
+      class="workout-data"
+      v-if="workoutObject.aveSpeed !== null && workoutObject.maxSpeed !== null"
+    >
       <i class="fa fa-tachometer" aria-hidden="true" />
       <span class="label">{{ $t('workouts.AVERAGE_SPEED') }}</span
       >:
diff --git a/fittrackee_client/src/types/workouts.ts b/fittrackee_client/src/types/workouts.ts
index d2261f53..d4e05b65 100644
--- a/fittrackee_client/src/types/workouts.ts
+++ b/fittrackee_client/src/types/workouts.ts
@@ -85,12 +85,12 @@ export interface IWorkout {
 
 export interface IWorkoutObject {
   ascent: number | null
-  aveSpeed: number
+  aveSpeed: number | null
   descent: number | null
   distance: number
   duration: string
   maxAlt: number | null
-  maxSpeed: number
+  maxSpeed: number | null
   minAlt: number | null
   moving: string
   nextUrl: string | null