diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index ff3244c4620..bf6afa3cee0 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -3018,6 +3018,8 @@ void ProjectExplorerPlugin::setSession(QAction *action)
 
 void ProjectExplorerPlugin::setProjectExplorerSettings(const Internal::ProjectExplorerSettings &pes)
 {
+    QTC_ASSERT(d->m_projectExplorerSettings.environmentId == pes.environmentId, return);
+
     if (d->m_projectExplorerSettings == pes)
         return;
     d->m_projectExplorerSettings = pes;
diff --git a/src/plugins/projectexplorer/projectexplorersettings.h b/src/plugins/projectexplorer/projectexplorersettings.h
index adf2b8a5586..507bf4612a6 100644
--- a/src/plugins/projectexplorer/projectexplorersettings.h
+++ b/src/plugins/projectexplorer/projectexplorersettings.h
@@ -81,7 +81,8 @@ inline bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerS
             && p1.useJom == p2.useJom
             && p1.autorestoreLastSession == p2.autorestoreLastSession
             && p1.prompToStopRunControl == p2.prompToStopRunControl
-            && p1.maxAppOutputLines == p2.maxAppOutputLines;
+            && p1.maxAppOutputLines == p2.maxAppOutputLines
+            && p1.environmentId == p2.environmentId;
 }
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
index c008919e8f9..86d4577bb06 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
@@ -81,6 +81,7 @@ ProjectExplorerSettings ProjectExplorerSettingsWidget::settings() const
     pes.useJom = m_ui.jomCheckbox->isChecked();
     pes.prompToStopRunControl = m_ui.promptToStopRunControlCheckBox->isChecked();
     pes.maxAppOutputLines = m_ui.maxAppOutputBox->value();
+    pes.environmentId = m_environmentId;
     return pes;
 }
 
@@ -98,6 +99,7 @@ void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings  &
     m_ui.jomCheckbox->setChecked(pes.useJom);
     m_ui.promptToStopRunControlCheckBox->setChecked(pes.prompToStopRunControl);
     m_ui.maxAppOutputBox->setValue(pes.maxAppOutputLines);
+    m_environmentId = pes.environmentId;
 }
 
 QString ProjectExplorerSettingsWidget::projectsDirectory() const
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.h b/src/plugins/projectexplorer/projectexplorersettingspage.h
index a2e40a79c38..75f63dcfb0d 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.h
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.h
@@ -34,6 +34,7 @@
 #include "ui_projectexplorersettingspage.h"
 
 #include <QPointer>
+#include <QUuid>
 
 namespace ProjectExplorer {
 namespace Internal {
@@ -70,6 +71,7 @@ private:
 
     Ui::ProjectExplorerSettingsPageUi m_ui;
     mutable QString m_searchKeywords;
+    QUuid m_environmentId;
 };
 
 class ProjectExplorerSettingsPage : public Core::IOptionsPage