diff --git a/wayland_server.cpp b/wayland_server.cpp
index c0e92e80b8..bc65724a81 100644
--- a/wayland_server.cpp
+++ b/wayland_server.cpp
@@ -189,6 +189,8 @@ bool WaylandServer::init(const QByteArray &socketName, InitalizationFlags flags)
     m_display = new KWayland::Server::Display(this);
     if (!socketName.isNull() && !socketName.isEmpty()) {
         m_display->setSocketName(QString::fromUtf8(socketName));
+    } else {
+        m_display->setAutomaticSocketNaming(true);
     }
     m_display->start();
     if (!m_display->isRunning()) {