diff --git a/megamek/resources/megamek/common/report-messages.properties b/megamek/resources/megamek/common/report-messages.properties
index 472d20e17e7..d0ec21710c6 100755
--- a/megamek/resources/megamek/common/report-messages.properties
+++ b/megamek/resources/megamek/common/report-messages.properties
@@ -1453,7 +1453,7 @@
 9080=<newline><data> (<data>) launches missile(s) from <data>.
 9085=<newline><data> (<data>) targets <data> (<data>) for attack.
 9090=\ The attack over-penetrates!!!
-9095=<newline><data> (<data>) loses <data> altitude(s) from weapon attack.
+9095=<newline><data> (<data>) loses <data> altitude(s) making an attack run.
 #9100 - critical <B>hits</B>
 9100=Possible critical hit (<data>)
 9101=; needs <data>, rolls <data> :
diff --git a/megamek/resources/megamek/common/report-messages_es.properties b/megamek/resources/megamek/common/report-messages_es.properties
index 140ca2ede5c..74a67922d03 100644
--- a/megamek/resources/megamek/common/report-messages_es.properties
+++ b/megamek/resources/megamek/common/report-messages_es.properties
@@ -1049,7 +1049,7 @@
 9080=<newline><data> (<data>) lanza misiles desde <data>.
 9085=<newline><data> (<data>) apunta a <data> (<data>) para el ataque.
 9090=\ \u00A1\u00A1\u00A1El ataque sobrepenetra !!!
-9095=<newline><data> (<data>) pierde <data> de altitud por ataque con arma.
+9095=<newline><data> (<data>) pierde <data> de altitud al realizar una pasada de ataque.
 # 9100 - <B>golpes</B> cr\u00EDticos
 9100=Posible golpe cr\u00EDtico (<data>)
 9101=; necesita <data>, saca <data>:
diff --git a/megamek/resources/megamek/common/report-messages_ru.properties b/megamek/resources/megamek/common/report-messages_ru.properties
index f1cd4a6850f..5d8ce117e26 100644
--- a/megamek/resources/megamek/common/report-messages_ru.properties
+++ b/megamek/resources/megamek/common/report-messages_ru.properties
@@ -885,7 +885,7 @@
 9080=<newline><data> (<data>) \u0437\u0430\u043F\u0443\u0441\u043A\u0430\u0435\u0442 <data> \u0440\u0430\u043A\u0435\u0442\u0443.
 9085=<newline><data> (<data>) \u043F\u0440\u0438\u0446\u0435\u043B\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u0432 <data> (<data>) \u0434\u043B\u044F \u0430\u0442\u0430\u043A\u0438.
 9090=\ \u0410\u0442\u0430\u043A\u0430 \u043F\u0440\u043E\u0431\u0438\u0432\u0430\u0435\u0442 \u043D\u0430\u0441\u043A\u0432\u043E\u0437\u044C!!!
-9095=<newline><data> (<data>) \u0442\u0435\u0440\u044F\u0435\u0442 <data> \u0432\u044B\u0441\u043E\u0442\u044B \u043E\u0442 \u0430\u0442\u0430\u043A\u0438 \u043E\u0440\u0443\u0436\u0438\u0435\u043C.
+9095=<newline><data> (<data>) \u0442\u0435\u0440\u044F\u0435\u0442 <data> \u0432\u044B\u0441\u043E\u0442\u044B, \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u044F \u0437\u0430\u0445\u043E\u0434 \u043D\u0430 \u0430\u0442\u0430\u043A\u0443.
 #9100 - \u043A\u0440\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 <B>\u043F\u043E\u043F\u0430\u0434\u0430\u043D\u0438\u044F</B>
 9100=\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0435 \u043A\u0440\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u043F\u043E\u043F\u0430\u0434\u0430\u043D\u0438\u0435 (<data>)
 9101=; \u043D\u0443\u0436\u043D\u043E <data>, \u0432\u044B\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u0435\u0442 <data> :
diff --git a/megamek/src/megamek/client/ui/panels/phaseDisplay/MovementDisplay.java b/megamek/src/megamek/client/ui/panels/phaseDisplay/MovementDisplay.java
index 11e54a66a76..5e4f1fc54a7 100644
--- a/megamek/src/megamek/client/ui/panels/phaseDisplay/MovementDisplay.java
+++ b/megamek/src/megamek/client/ui/panels/phaseDisplay/MovementDisplay.java
@@ -2195,8 +2195,14 @@ private boolean checkNags() {
         // Check for unused velocity for airborne and spacecraft.
         if (needNagForOther()) {
             if ((currentlySelectedEntity != null) && (null != cmd) && currentlySelectedEntity.isAero()) {
-                boolean airborneOrSpaceborne = currentlySelectedEntity.isAirborne() ||
-                      currentlySelectedEntity.isSpaceborne();
+                // An aerodyne reports itself airborne at any altitude, so a fighter sitting on the ground
+                // still looks like it is flying. Left in, this refuses to end the turn over velocity the unit
+                // has no way to spend: on a ground map one point costs sixteen hexes of movement, and every
+                // move step is illegal at altitude 0 anyway. That combination strands the unit for good.
+                boolean isOnTheGround = (currentlySelectedEntity.getAltitude() == 0)
+                      && game.getBoard(currentlySelectedEntity).isGround();
+                boolean airborneOrSpaceborne = (currentlySelectedEntity.isAirborne() && !isOnTheGround)
+                      || currentlySelectedEntity.isSpaceborne();
                 boolean unusedVelocity;
 
                 if (null != cmd.getLastStep()) {