diff --git a/frontend/src/components/editor/EditorToolbar.tsx b/frontend/src/components/editor/EditorToolbar.tsx
index 836321c0..869fd9e8 100644
--- a/frontend/src/components/editor/EditorToolbar.tsx
+++ b/frontend/src/components/editor/EditorToolbar.tsx
@@ -1073,7 +1073,7 @@ export const EditorToolbar = ({
         continue;
       }
 
-      const fqbn = BOARD_KIND_FQBN[board.boardKind];
+      const fqbn = fqbnForLanguage(board.boardKind, board.languageMode);
       if (!fqbn) {
         blog('error', 'no FQBN configured');
         boardFailed++;