diff --git a/src/wayland-client.c b/src/wayland-client.c
index d3989ed4..9656cb5b 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -422,7 +422,9 @@ wl_display_get_fd(struct wl_display *display,
 	display->update = update;
 	display->update_data = data;
 
-	display->update(display->mask, display->update_data);
+	if (display->update)
+		display->update(display->mask,
+		                display->update_data);
 
 	return display->fd;
 }