diff --git a/src/wayland-server-core.h b/src/wayland-server-core.h
index c8a64772..f3377f10 100644
--- a/src/wayland-server-core.h
+++ b/src/wayland-server-core.h
@@ -205,6 +205,9 @@ wl_display_add_socket_auto(struct wl_display *display);
 int
 wl_display_add_socket_fd(struct wl_display *display, int sock_fd);
 
+int
+wl_display_remove_socket_fd(struct wl_display *display, int sock_fd);
+
 void
 wl_display_terminate(struct wl_display *display);
 
diff --git a/src/wayland-server.c b/src/wayland-server.c
index c81d98f1..2493b962 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -1935,6 +1935,37 @@ wl_display_add_socket_fd(struct wl_display *display, int sock_fd)
 	return 0;
 }
 
+/** Remove a socket fd from the Wayland display.
+ *
+ * \param display Wayland display to which the socket should be added.
+ * \param sock_fd The socket file descriptor to be removed
+ * \return 0 if success. -1 if failed.
+ *
+ * Remove a socket fd previously added via wl_display_add_socket_fd().
+ *
+ * \memberof wl_display
+ * \since 1.22.90
+ */
+WL_EXPORT int
+wl_display_remove_socket_fd(struct wl_display *display, int sock_fd)
+{
+	struct wl_socket *s;
+	bool found;
+
+	found = false;
+	wl_list_for_each(s, &display->socket_list, link) {
+		if (s->fd == sock_fd) {
+			found = true;
+			break;
+		}
+	}
+	if (!found)
+		return -1;
+
+	wl_socket_destroy(s);
+	return 0;
+}
+
 /** Add a socket to Wayland display for the clients to connect.
  *
  * \param display Wayland display to which the socket should be added.