diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 91c4baed5d2..ae27e748cb3 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1027,7 +1027,7 @@ LinuxDevice::LinuxDevice()
             d->m_terminals.removeOne(proc);
         });
 
-        proc->setCommand({ mapToGlobalPath({}), {}});
+        proc->setCommand({filePath({}), {}});
         proc->setTerminalMode(TerminalMode::On);
         proc->setEnvironment(env);
         proc->setWorkingDirectory(workingDir);
diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
index ac1bbc6f9d5..2c3650206c6 100644
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
@@ -81,8 +81,7 @@ void RemoteLinuxCheckForFreeDiskSpaceService::setRequiredSpaceInBytes(quint64 si
 void RemoteLinuxCheckForFreeDiskSpaceService::deployAndFinish()
 {
     auto cleanup = qScopeGuard([this] { setFinished(); });
-    const FilePath path
-            = deviceConfiguration()->mapToGlobalPath(FilePath::fromString(m_pathToCheck));
+    const FilePath path = deviceConfiguration()->filePath(m_pathToCheck);
     const qint64 freeSpace = path.bytesAvailable();
     if (freeSpace < 0) {
         emit errorMessage(tr("Cannot get info about free disk space for \"%1\"")