diff --git a/fittrackee_client/src/components/Workout/WorkoutCard.vue b/fittrackee_client/src/components/Workout/WorkoutCard.vue
index da3c5bbf..e6ad19a3 100644
--- a/fittrackee_client/src/components/Workout/WorkoutCard.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutCard.vue
@@ -114,7 +114,7 @@
             />
           </div>
         </div>
-        <div class="data altitude" v-if="workout && workout.with_gpx">
+        <div class="data altitude" v-if="hasElevation(workout)">
           <i class="fa fa-location-arrow" aria-hidden="true" />
           <div class="data-values">
             +<Distance
@@ -167,6 +167,10 @@
   const locale: ComputedRef<Locale> = computed(
     () => store.getters[ROOT_STORE.GETTERS.LOCALE]
   )
+
+  function hasElevation(workout: IWorkout): boolean {
+    return workout && workout.ascent !== null && workout.descent !== null
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/fittrackee_client/src/components/Workouts/WorkoutsList.vue b/fittrackee_client/src/components/Workouts/WorkoutsList.vue
index 97d3ab94..d63668c3 100644
--- a/fittrackee_client/src/components/Workouts/WorkoutsList.vue
+++ b/fittrackee_client/src/components/Workouts/WorkoutsList.vue
@@ -134,7 +134,7 @@
                   {{ $t('workouts.ASCENT') }}
                 </span>
                 <Distance
-                  v-if="workout.with_gpx"
+                  v-if="workout.ascent !== null"
                   :distance="workout.ascent"
                   unitFrom="m"
                   :useImperialUnits="user.imperial_units"
@@ -145,7 +145,7 @@
                   {{ $t('workouts.DESCENT') }}
                 </span>
                 <Distance
-                  v-if="workout.with_gpx"
+                  v-if="workout.descent !== null"
                   :distance="workout.descent"
                   unitFrom="m"
                   :useImperialUnits="user.imperial_units"