diff --git a/src/sensor/ping360.h b/src/sensor/ping360.h
index 9e253d15e..71cc7b773 100644
--- a/src/sensor/ping360.h
+++ b/src/sensor/ping360.h
@@ -150,7 +150,13 @@ class Ping360 : public PingSensor {
      *
      * @return uint16_t
      */
-    uint16_t angle() { return (_angle + angle_offset() + static_cast<int>(_heading)) % _angularResolutionGrad; }
+    uint16_t angle()
+    {
+        // Only use heading correction if running in full scam mode (sector size == resolution)
+        const int angle
+            = _angle + angle_offset() + (_sectorSize == _angularResolutionGrad ? static_cast<int>(_heading) : 0);
+        return angle % _angularResolutionGrad;
+    }
     Q_PROPERTY(int angle READ angle NOTIFY angleChanged)
 
     /**