diff --git a/ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.h b/ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.h
index b8b1424a5..ab4ba26e8 100644
--- a/ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.h
+++ b/ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.h
@@ -47,7 +47,7 @@ public slots:
 private slots:
 
 private:
-    static const int MAX_SATTELITES = 16;
+    static const int MAX_SATTELITES = 24;
     int satellites[MAX_SATTELITES][4];
     QGraphicsScene *scene;
     QSvgRenderer *renderer;
diff --git a/ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.h b/ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.h
index 1ff48b168..1d1a183d6 100644
--- a/ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.h
+++ b/ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.h
@@ -16,7 +16,7 @@ public slots:
     void updateSat(int index, int prn, int elevation, int azimuth, int snr);
 
 private:
-    static const int MAX_SATTELITES = 16;
+    static const int MAX_SATTELITES = 24;
     int satellites[MAX_SATTELITES][4];
     QGraphicsScene *scene;
     QGraphicsRectItem *boxes[MAX_SATTELITES];
diff --git a/shared/uavobjectdefinition/gpssatellites.xml b/shared/uavobjectdefinition/gpssatellites.xml
index 5ad5fc7de..9267c2617 100644
--- a/shared/uavobjectdefinition/gpssatellites.xml
+++ b/shared/uavobjectdefinition/gpssatellites.xml
@@ -2,10 +2,10 @@
     <object name="GPSSatellites" singleinstance="true" settings="false" category="Sensors">
         <description>Contains information about the GPS satellites in view from @ref GPSModule.</description>
         <field name="SatsInView" units="" type="int8" elements="1"/>
-        <field name="PRN" units="" type="uint8" elements="16"/>
-        <field name="Elevation" units="degrees" type="int8" elements="16"/>
-        <field name="Azimuth" units="degrees" type="int16" elements="16"/>
-        <field name="SNR" units="" type="int8" elements="16"/>
+        <field name="PRN" units="" type="uint8" elements="24"/>
+        <field name="Elevation" units="degrees" type="int8" elements="24"/>
+        <field name="Azimuth" units="degrees" type="int16" elements="24"/>
+        <field name="SNR" units="" type="int8" elements="24"/>
         <access gcs="readwrite" flight="readwrite"/>
         <telemetrygcs acked="false" updatemode="manual" period="0"/>
         <telemetryflight acked="false" updatemode="periodic" period="10000"/>