diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index d06c6d88134..2f6c2fac9d1 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -68,9 +68,13 @@ QString RemoteLinuxEnvironmentAspect::baseEnvironmentDisplayName(int base) const
 
 Utils::Environment RemoteLinuxEnvironmentAspect::baseEnvironment() const
 {
+    Utils::Environment env;
     if (baseEnvironmentBase() == static_cast<int>(RemoteBaseEnvironment))
-        return m_remoteEnvironment;
-    return Utils::Environment();
+        env = m_remoteEnvironment;
+    const QString displayKey = QLatin1String("DISPLAY");
+    if (!env.hasKey(displayKey))
+        env.appendOrSet(displayKey, QLatin1String(":0.0"));
+    return env;
 }
 
 AbstractRemoteLinuxRunConfiguration *RemoteLinuxEnvironmentAspect::runConfiguration() const
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index dbdd2698478..3a906f7cb1a 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -178,12 +178,7 @@ Environment RemoteLinuxRunConfiguration::environment() const
 {
     RemoteLinuxEnvironmentAspect *aspect = extraAspect<RemoteLinuxEnvironmentAspect>();
     QTC_ASSERT(aspect, return Environment());
-    Environment env(OsTypeLinux);
-    env.modify(aspect->userEnvironmentChanges());
-    const QString displayKey = QLatin1String("DISPLAY");
-    if (!env.hasKey(displayKey))
-        env.appendOrSet(displayKey, QLatin1String(":0.0"));
-    return env;
+    return aspect->environment();
 }
 
 QString RemoteLinuxRunConfiguration::localExecutableFilePath() const