diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CachedTrackPointsIndexes.java b/src/main/java/de/dennisguse/opentracks/content/provider/CachedTrackPointsIndexes.java
index 73d6bff13..d63808c10 100644
--- a/src/main/java/de/dennisguse/opentracks/content/provider/CachedTrackPointsIndexes.java
+++ b/src/main/java/de/dennisguse/opentracks/content/provider/CachedTrackPointsIndexes.java
@@ -19,6 +19,7 @@ class CachedTrackPointsIndexes {
     final int sensorHeartRateIndex;
     final int sensorCadenceIndex;
     final int sensorPowerIndex;
+    final int elevationGainIndex;
 
     CachedTrackPointsIndexes(Cursor cursor) {
         idIndex = cursor.getColumnIndex(TrackPointsColumns._ID);
@@ -32,5 +33,6 @@ class CachedTrackPointsIndexes {
         sensorHeartRateIndex = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_HEARTRATE);
         sensorCadenceIndex = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_CADENCE);
         sensorPowerIndex = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_POWER);
+        elevationGainIndex = cursor.getColumnIndexOrThrow(TrackPointsColumns.ELEVATION_GAIN);
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
index 4d67d2d30..0721254ae 100644
--- a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
@@ -648,6 +648,10 @@ public class ContentProviderUtils {
             trackPoint.setPower(cursor.getFloat(indexes.sensorPowerIndex));
         }
 
+        if (!cursor.isNull(indexes.elevationGainIndex)) {
+            trackPoint.setElevationGain(cursor.getFloat(indexes.elevationGainIndex));
+        }
+
         return trackPoint;
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java b/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java
index 4c0b60113..b5313da8b 100644
--- a/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java
+++ b/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java
@@ -215,6 +215,8 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
         db.execSQL("INSERT INTO trackpoints SELECT _id, trackid, longitude, latitude, time, elevation, accuracy, speed, bearing, sensor_heartrate, sensor_cadence, sensor_power FROM trackpoints_old");
         db.execSQL("DROP TABLE trackpoints_old");
 
+        db.execSQL("CREATE INDEX trackpoints_trackid_index ON trackpoints(trackid)");
+
         db.setTransactionSuccessful();
         db.endTransaction();
     }