diff --git a/client.cpp b/client.cpp
index 2f9dbd3c72..5ea2286582 100644
--- a/client.cpp
+++ b/client.cpp
@@ -159,7 +159,6 @@ Client::Client()
 
     geom = QRect(0, 0, 100, 100);   // So that decorations don't start with size being (0,0)
     client_size = QSize(100, 100);
-    ready_for_painting = false; // wait for first damage or sync reply
 
     connect(clientMachine(), &ClientMachine::localhostChanged, this, &Client::updateCaption);
     connect(options, &Options::condensedTitleChanged, this, &Client::updateCaption);
diff --git a/internal_client.cpp b/internal_client.cpp
index 9811a52b31..5583abbb32 100644
--- a/internal_client.cpp
+++ b/internal_client.cpp
@@ -41,9 +41,6 @@ InternalClient::InternalClient(QWindow *window)
     , m_windowId(window->winId())
     , m_internalWindowFlags(window->flags())
 {
-    // Don't render the client until it provides a buffer.
-    ready_for_painting = false;
-
     connect(m_internalWindow, &QWindow::xChanged, this, &InternalClient::updateInternalWindowGeometry);
     connect(m_internalWindow, &QWindow::yChanged, this, &InternalClient::updateInternalWindowGeometry);
     connect(m_internalWindow, &QWindow::widthChanged, this, &InternalClient::updateInternalWindowGeometry);
diff --git a/toplevel.cpp b/toplevel.cpp
index c346818fcc..cc6c7e4d05 100644
--- a/toplevel.cpp
+++ b/toplevel.cpp
@@ -43,7 +43,7 @@ Toplevel::Toplevel()
     : m_visual(XCB_NONE)
     , bit_depth(24)
     , info(nullptr)
-    , ready_for_painting(true)
+    , ready_for_painting(false)
     , m_isDamaged(false)
     , m_internalId(QUuid::createUuid())
     , m_client()
diff --git a/unmanaged.cpp b/unmanaged.cpp
index 8e1f2dcf19..6c4c6abae4 100644
--- a/unmanaged.cpp
+++ b/unmanaged.cpp
@@ -45,7 +45,6 @@ const NET::WindowTypes SUPPORTED_UNMANAGED_WINDOW_TYPES_MASK = NET::NormalMask |
 Unmanaged::Unmanaged()
     : Toplevel()
 {
-    ready_for_painting = false;
     connect(this, SIGNAL(geometryShapeChanged(KWin::Toplevel*,QRect)), SIGNAL(geometryChanged()));
     QTimer::singleShot(50, this, SLOT(setReadyForPainting()));
 }
diff --git a/xdgshellclient.cpp b/xdgshellclient.cpp
index 4f344a3b6c..9313d854fe 100644
--- a/xdgshellclient.cpp
+++ b/xdgshellclient.cpp
@@ -196,7 +196,6 @@ void XdgShellClient::init()
     updateIcon();
     SurfaceInterface *s = surface();
     Q_ASSERT(s);
-    ready_for_painting = false;
     doSetGeometry(QRect(QPoint(0, 0), m_clientSize));
     if (waylandServer()->inputMethodConnection() == s->client()) {
         m_windowType = NET::OnScreenDisplay;