diff --git a/userspace/programs/WindowServer/Window.cpp b/userspace/programs/WindowServer/Window.cpp
index 1e66f522..78de89c9 100644
--- a/userspace/programs/WindowServer/Window.cpp
+++ b/userspace/programs/WindowServer/Window.cpp
@@ -31,8 +31,6 @@ Window::~Window()
 			total_sent += nsend;
 		}
 	}
-
-	close(m_client_fd);
 }
 
 BAN::ErrorOr<void> Window::initialize(BAN::StringView title, uint32_t width, uint32_t height)
diff --git a/userspace/programs/WindowServer/main.cpp b/userspace/programs/WindowServer/main.cpp
index 5b860dc7..82fcbd8e 100644
--- a/userspace/programs/WindowServer/main.cpp
+++ b/userspace/programs/WindowServer/main.cpp
@@ -326,6 +326,7 @@ int main()
 				if (auto ret = window_server.add_client_fd(client_fd); ret.is_error())
 				{
 					dwarnln("add_client: {}", ret.error());
+					epoll_ctl(g_epoll_fd, EPOLL_CTL_DEL, client_fd, nullptr);
 					close(client_fd);
 					continue;
 				}