diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 816f7b8ab..d773d9a1c 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -375,19 +375,20 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_peerInstance = new LocalPeer(this, appID);
         connect(m_peerInstance, &LocalPeer::messageReceived, this, &Application::messageReceived);
         if (m_peerInstance->isClient()) {
+            bool sentMessage = false;
             int timeout = 2000;
 
             if (m_instanceIdToLaunch.isEmpty()) {
                 ApplicationMessage activate;
                 activate.command = "activate";
-                m_peerInstance->sendMessage(activate.serialize(), timeout);
+                sentMessage = m_peerInstance->sendMessage(activate.serialize(), timeout);
 
                 if (!m_urlsToImport.isEmpty()) {
                     for (auto url : m_urlsToImport) {
                         ApplicationMessage import;
                         import.command = "import";
                         import.args.insert("url", url.toString());
-                        m_peerInstance->sendMessage(import.serialize(), timeout);
+                        sentMessage = m_peerInstance->sendMessage(import.serialize(), timeout);
                     }
                 }
             } else {
@@ -407,10 +408,16 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
                     launch.args["offline_enabled"] = "true";
                     launch.args["offline_name"] = m_offlineName;
                 }
-                m_peerInstance->sendMessage(launch.serialize(), timeout);
+                sentMessage = m_peerInstance->sendMessage(launch.serialize(), timeout);
+            }
+            if (sentMessage) {
+                m_status = Application::Succeeded;
+                return;
+            } else {
+                std::cerr << "Unable to redirect command to already running instance\n";
+                // C function not Qt function - event loop not started yet
+                ::exit(1);
             }
-            m_status = Application::Succeeded;
-            return;
         }
     }
 
diff --git a/libraries/LocalPeer/src/LocalPeer.cpp b/libraries/LocalPeer/src/LocalPeer.cpp
index bd407042f..c1875bf98 100644
--- a/libraries/LocalPeer/src/LocalPeer.cpp
+++ b/libraries/LocalPeer/src/LocalPeer.cpp
@@ -76,7 +76,7 @@ ApplicationId ApplicationId::fromTraditionalApp()
     prefix.truncate(6);
     QByteArray idc = protoId.toUtf8();
     quint16 idNum = qChecksum(idc.constData(), idc.size());
-    auto socketName = QLatin1String("qtsingleapp-") + prefix + QLatin1Char('-') + QString::number(idNum, 16);
+    auto socketName = QLatin1String("pl") + prefix + QLatin1Char('-') + QString::number(idNum, 16).left(12);
 #if defined(Q_OS_WIN)
     if (!pProcessIdToSessionId) {
         QLibrary lib("kernel32");
@@ -98,12 +98,12 @@ ApplicationId ApplicationId::fromPathAndVersion(const QString& dataPath, const Q
     QCryptographicHash shasum(QCryptographicHash::Algorithm::Sha1);
     QString result = dataPath + QLatin1Char('-') + version;
     shasum.addData(result.toUtf8());
-    return ApplicationId(QLatin1String("qtsingleapp-") + QString::fromLatin1(shasum.result().toHex()));
+    return ApplicationId(QLatin1String("pl") + QString::fromLatin1(shasum.result().toHex()).left(12));
 }
 
 ApplicationId ApplicationId::fromCustomId(const QString& id)
 {
-    return ApplicationId(QLatin1String("qtsingleapp-") + id);
+    return ApplicationId(QLatin1String("pl") + id);
 }
 
 ApplicationId ApplicationId::fromRawString(const QString& id)
@@ -139,7 +139,7 @@ bool LocalPeer::isClient()
 #if defined(Q_OS_UNIX)
     // ### Workaround
     if (!res && server->serverError() == QAbstractSocket::AddressInUseError) {
-        QFile::remove(QDir::cleanPath(QDir::tempPath()) + QLatin1Char('/') + socketName);
+        QLocalServer::removeServer(socketName);
         res = server->listen(socketName);
     }
 #endif