diff --git a/Nasal/ECAM-controller.nas b/Nasal/ECAM-controller.nas
index 20179fd1..8cdc3877 100644
--- a/Nasal/ECAM-controller.nas
+++ b/Nasal/ECAM-controller.nas
@@ -157,7 +157,8 @@ var fob_3T = warning.new(msg: "FOB BELOW 3T", active: 0, colour: "g", aural: "no
 var refuelg = warning.new(msg: "REFUELG", active: 0, colour: "g", aural: "none", light: "none", noRepeat: 0),
 var seatbelts = warning.new(msg: "SEAT BELTS", active: 0, colour: "g", aural: "none", light: "none", noRepeat: 0),
 var nosmoke = warning.new(msg: "NO SMOKING", active: 0, colour: "g", aural: "none", light: "none", noRepeat: 0),
-var strobe_lt_off = warning.new(msg: "STROBE LT OFF", active: 0, colour: "g", aural: "none", light: "none", noRepeat: 0)
+var strobe_lt_off = warning.new(msg: "STROBE LT OFF", active: 0, colour: "g", aural: "none", light: "none", noRepeat: 0),
+var gpws_flap_mode_off = warning.new(msg: "GPWS FLAP MODE OFF", active: 0, colour: "g", aural: "none", light: "none", noRepeat: 0)
 ]);
 
 var memos = std.Vector.new([
@@ -280,6 +281,12 @@ var messages_memo = func {
 	} else {
 		strobe_lt_off.active = 0;
 	}
+
+	if (getprop("instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override") == 1) {
+		gpws_flap_mode_off.active = 1;
+	} else {
+		gpws_flap_mode_off.active = 0;
+	}
 	
 	if (getprop("/consumables/fuel/total-fuel-lbs") < 6000 and getprop("/ECAM/left-msg") != "TO-MEMO" and getprop("/ECAM/left-msg") != "LDG-MEMO") { # assuming US short ton 2000lb
 		fob_3T.active = 1;