diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 237676921ec..878332ca327 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -60,8 +60,6 @@ QWaylandWindow::QWaylandWindow(QWindow *window, QWaylandDisplay *display)
             mFrameCallbackTimeout = frameCallbackTimeout;
     }
 
-    mScale = waylandScreen() ? waylandScreen()->scale() : 1; // fallback to 1 if we don't have a real screen
-
     static WId id = 1;
     mWindowId = id++;
     initializeWlSurface();
@@ -327,6 +325,7 @@ void QWaylandWindow::reset()
     mWaitingToApplyConfigure = false;
     mCanResize = true;
     mResizeDirty = false;
+    mScale = std::nullopt;
 
     mOpaqueArea = QRegion();
     mMask = QRegion();
@@ -1481,7 +1480,7 @@ void QWaylandWindow::updateScale()
 
 void QWaylandWindow::setScale(qreal newScale)
 {
-    if (qFuzzyCompare(mScale, newScale))
+    if (mScale.has_value() && qFuzzyCompare(mScale.value(), newScale))
         return;
     mScale = newScale;
 
@@ -1490,7 +1489,7 @@ void QWaylandWindow::setScale(qreal newScale)
         if (mViewport)
             updateViewport();
         else if (mSurface->version() >= 3)
-            mSurface->set_buffer_scale(std::ceil(mScale));
+            mSurface->set_buffer_scale(std::ceil(newScale));
     }
     ensureSize();
 
@@ -1552,7 +1551,7 @@ qreal QWaylandWindow::scale() const
 
 qreal QWaylandWindow::devicePixelRatio() const
 {
-    return qreal(mScale);
+    return mScale.value_or(waylandScreen() ? waylandScreen()->scale() : 1);
 }
 
 bool QWaylandWindow::setMouseGrabEnabled(bool grab)
diff --git a/src/plugins/platforms/wayland/qwaylandwindow_p.h b/src/plugins/platforms/wayland/qwaylandwindow_p.h
index b78c8ce4ed6..63b140f0b0f 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow_p.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow_p.h
@@ -310,7 +310,7 @@ protected:
 
     bool mSentInitialResize = false;
     QPoint mOffset;
-    qreal mScale = 1;
+    std::optional<qreal> mScale = 1;
     QPlatformScreen *mLastReportedScreen = nullptr;
 
     QString mWindowTitle;