diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index 540c36a30d..5904b49597 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -226,7 +226,7 @@ class Board:
                 '-Werror=unused-but-set-variable'
             ]
             (major, minor, patchlevel) = cfg.env.CC_VERSION
-            if int(major) >= 5 and int(minor) > 1:
+            if int(major) >= 5 and int(minor) > 1 and not self.with_uavcan:
                 env.CXXFLAGS += [
                     '-Werror=suggest-override',
                 ]
diff --git a/Tools/ardupilotwaf/chibios.py b/Tools/ardupilotwaf/chibios.py
index 0c1e4196c0..b8ce0937ca 100644
--- a/Tools/ardupilotwaf/chibios.py
+++ b/Tools/ardupilotwaf/chibios.py
@@ -190,6 +190,12 @@ def setup_can_build(cfg):
         '-DUAVCAN_STM32_NUM_IFACES=2'
         ]
 
+    (major, minor, patchlevel) = cfg.env.CC_VERSION
+    if int(major) >= 5 and int(minor) > 1:
+        env.CXXFLAGS += [
+            '-Wno-error=suggest-override',
+        ]
+
     env.DEFINES += [
         'UAVCAN_CPP_VERSION=UAVCAN_CPP03',
         'UAVCAN_NO_ASSERTIONS=1',