diff --git a/src/libs/utils/terminalcommand.cpp b/src/libs/utils/terminalcommand.cpp
index 923b0cd4fe2..bb1492515f3 100644
--- a/src/libs/utils/terminalcommand.cpp
+++ b/src/libs/utils/terminalcommand.cpp
@@ -114,6 +114,8 @@ TerminalCommand TerminalCommand::terminalEmulator()
     if (s_settings && HostOsInfo::isAnyUnixHost() && s_settings->contains(kTerminalCommandKey)) {
         FilePath command = FilePath::fromSettings(s_settings->value(kTerminalCommandKey));
 
+        // TODO Remove some time after Qt Creator 11
+        // Work around Qt Creator <= 10 writing the default terminal to the settings.
         if (HostOsInfo::isMacHost() && command.endsWith("openTerminal.py"))
             command = FilePath::fromString("Terminal.app");
 
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 2d7ec70c8eb..c93710ff580 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -63,6 +63,7 @@
 #include <utils/stylehelper.h>
 #include <utils/theme/theme.h>
 #include <utils/touchbar/touchbar.h>
+#include <utils/terminalcommand.h>
 #include <utils/utilsicons.h>
 
 #include <QAbstractProxyModel>
@@ -1228,6 +1229,14 @@ void MainWindow::saveSettings()
     EditorManagerPrivate::saveSettings();
     m_leftNavigationWidget->saveSettings(settings);
     m_rightNavigationWidget->saveSettings(settings);
+
+    // TODO Remove some time after Qt Creator 11
+    // Work around Qt Creator <= 10 writing the default terminal to the settings.
+    // TerminalCommand writes the terminal to the settings when changing it, which usually is
+    // enough. But because of the bug in Qt Creator <= 10 we want to clean up the settings
+    // even if the user never touched the terminal setting.
+    if (HostOsInfo::isMacHost())
+        TerminalCommand::setTerminalEmulator(TerminalCommand::terminalEmulator());
 }
 
 void MainWindow::saveWindowSettings()