diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
index b0da10fa1..15180e017 100644
--- a/src/daemon/XorgDisplayServer.cpp
+++ b/src/daemon/XorgDisplayServer.cpp
@@ -290,7 +290,10 @@ namespace SDDM {
         // start display setup script
         qDebug() << "Running display setup script " << displayCommand;
         displayScript->start(displayCommand);
-        displayScript->waitForFinished(-1);
+
+        // wait for finished
+        if (!displayScript->waitForFinished(30000))
+            displayScript->kill();
     }
 
     void XorgDisplayServer::changeOwner(const QString &fileName) {