diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18ba4097..7f1f275c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Fixed
+- The handling function of the GPS data is only called once per GPS read. This should remove
+  the fake fix-has-changed events.
+
 # [v6.3.0] 2023-08-03
 
 ## Fixed
diff --git a/linux/acs/GpsHyperionLinuxController.cpp b/linux/acs/GpsHyperionLinuxController.cpp
index 900de0aa..b451c112 100644
--- a/linux/acs/GpsHyperionLinuxController.cpp
+++ b/linux/acs/GpsHyperionLinuxController.cpp
@@ -166,30 +166,32 @@ bool GpsHyperionLinuxController::readGpsDataFromGpsd() {
   if (mode == MODE_OFF) {
     return false;
   }
+  unsigned int readIdx = 0;
   if (readMode == ReadModes::SOCKET) {
     // Poll the GPS.
-    if (gps_waiting(&gps, 0)) {
-      if (-1 == gps_read(&gps)) {
+    while (gps_waiting(&gps, 0)) {
+      int retval = gps_read(&gps);
+      if (retval < 0) {
         readError();
         return false;
       }
-      oneShotSwitches.gpsReadFailedSwitch = true;
-      ReturnValue_t result = handleGpsReadData();
-      if (result == returnvalue::OK) {
-        return true;
-      } else {
-        return false;
+      readIdx++;
+      if (readIdx >= 40) {
+        sif::warning << "GpsHyperionLinuxController: Received " << readIdx
+                     << " GPSD message consecutively" << std::endl;
+        break;
       }
-      noModeSetCntr = 0;
-    } else {
-      return false;
+    }
+    if (readIdx > 0) {
+      oneShotSwitches.gpsReadFailedSwitch = true;
+      handleGpsReadData();
     }
   } else if (readMode == ReadModes::SHM) {
     sif::error << "GpsHyperionLinuxController::readGpsDataFromGpsdPermanentLoop: "
                   "SHM read not implemented"
                << std::endl;
   }
-  return true;
+  return false;
 }
 
 ReturnValue_t GpsHyperionLinuxController::handleGpsReadData() {
diff --git a/linux/acs/GpsHyperionLinuxController.h b/linux/acs/GpsHyperionLinuxController.h
index d5b1f637..5a8494dd 100644
--- a/linux/acs/GpsHyperionLinuxController.h
+++ b/linux/acs/GpsHyperionLinuxController.h
@@ -81,7 +81,6 @@ class GpsHyperionLinuxController : public ExtendedControllerBase {
   } oneShotSwitches;
 
   bool debugHyperionGps = false;
-  int32_t noModeSetCntr = 0;
 
   // Returns true if the function should be called again or false if other
   // controller handling can be done.