diff --git a/src/Navaids/waypoint.cxx b/src/Navaids/waypoint.cxx
index 5992774b1..12cee7744 100644
--- a/src/Navaids/waypoint.cxx
+++ b/src/Navaids/waypoint.cxx
@@ -39,6 +39,9 @@ BasicWaypt::BasicWaypt(const SGGeod& aPos, const string& aIdent, Route* aOwner)
   _pos(aPos),
   _ident(aIdent)
 {
+  if (aPos.getElevationFt() > -999.0) {
+    setAltitude(aPos.getElevationFt(), RESTRICT_AT);
+  }
 }
 
 BasicWaypt::BasicWaypt(const SGWayPoint& aWP, Route* aOwner) :