diff --git a/src/x11window.cpp b/src/x11window.cpp
index f39d1d585d..918fa6a398 100644
--- a/src/x11window.cpp
+++ b/src/x11window.cpp
@@ -4612,11 +4612,7 @@ void X11Window::setFullScreen(bool set, bool user)
         }
     } else {
         Q_ASSERT(!fullscreenGeometryRestore().isNull());
-        Output *currentOutput = moveResizeOutput();
         moveResize(QRectF(fullscreenGeometryRestore().topLeft(), constrainFrameSize(fullscreenGeometryRestore().size())));
-        if (currentOutput != moveResizeOutput()) {
-            workspace()->sendWindowToOutput(this, currentOutput);
-        }
     }
 
     updateWindowRules(Rules::Fullscreen | Rules::Position | Rules::Size);
diff --git a/src/xdgshellwindow.cpp b/src/xdgshellwindow.cpp
index 3b99767136..c205aafab8 100644
--- a/src/xdgshellwindow.cpp
+++ b/src/xdgshellwindow.cpp
@@ -1618,12 +1618,8 @@ void XdgToplevelWindow::setFullScreen(bool set, bool user)
     } else {
         m_fullScreenRequestedOutput.clear();
         if (fullscreenGeometryRestore().isValid()) {
-            Output *currentOutput = moveResizeOutput();
             moveResize(QRectF(fullscreenGeometryRestore().topLeft(),
                               constrainFrameSize(fullscreenGeometryRestore().size())));
-            if (currentOutput != moveResizeOutput()) {
-                workspace()->sendWindowToOutput(this, currentOutput);
-            }
         } else {
             // this can happen when the window was first shown already fullscreen,
             // so let the client set the size by itself