diff --git a/backends/kwayland/waylandconfig.h b/backends/kwayland/waylandconfig.h
--- a/backends/kwayland/waylandconfig.h
+++ b/backends/kwayland/waylandconfig.h
@@ -100,7 +100,7 @@
     QMap<int, WaylandOutput*> m_outputMap;
 
     // KWayland names
-    QList<int> m_initializingOutputs;
+    QList<WaylandOutput*> m_initializingOutputs;
     int m_lastOutputId = -1;
 
     bool m_registryInitialized;
diff --git a/backends/kwayland/waylandconfig.cpp b/backends/kwayland/waylandconfig.cpp
--- a/backends/kwayland/waylandconfig.cpp
+++ b/backends/kwayland/waylandconfig.cpp
@@ -167,11 +167,9 @@
 
 void WaylandConfig::addOutput(quint32 name, quint32 version)
 {
-    // KWayland should only add this output once before removing again
-    Q_ASSERT(!m_initializingOutputs.contains(name));
-    m_initializingOutputs << name;
-
     WaylandOutput *waylandoutput = new WaylandOutput(++s_outputId, name, this);
+    m_initializingOutputs << waylandoutput;
+
     connect(waylandoutput, &WaylandOutput::deviceRemoved, this, [this, waylandoutput]() {
         removeOutput(waylandoutput);
     });
@@ -181,7 +179,7 @@
     // remove if from the list of initializing outputs, and emit configChanged()
     connect(waylandoutput, &WaylandOutput::complete, this, [this, waylandoutput, name]{
         m_outputMap.insert(waylandoutput->id(), waylandoutput);
-        m_initializingOutputs.removeAll(name);
+        m_initializingOutputs.removeOne(waylandoutput);
         checkInitialized();
 
         if (!m_blockSignals && m_initializingOutputs.empty()) {
@@ -199,7 +197,7 @@
 
 void WaylandConfig::removeOutput(WaylandOutput *output)
 {
-    if (m_initializingOutputs.removeOne(output->wlName())) {
+    if (m_initializingOutputs.removeOne(output)) {
         // output was not yet fully initialized, just remove here and return
         delete output;
         return;