diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp
index 7bbeaa992..632c9e79a 100644
--- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp
@@ -1372,7 +1372,11 @@ void ADSBDemodGUI::sendToMap(Aircraft *aircraft, QList<SWGSDRangel::SWGMapAnimat
                 swgMapItem->setOrientation(1);
                 swgMapItem->setHeading(aircraft->m_track);
                 swgMapItem->setPitch(aircraft->m_pitchEst);
-                swgMapItem->setRoll(aircraft->m_rollEst);
+                if (aircraft->m_rollValid) {
+                    swgMapItem->setRoll(aircraft->m_roll);
+                } else {
+                    swgMapItem->setRoll(aircraft->m_rollEst);
+                }
                 swgMapItem->setOrientationDateTime(new QString(aircraft->m_positionDateTime.toString(Qt::ISODateWithMs)));
             }
             else