diff --git a/shared/cairo-util.c b/shared/cairo-util.c
index 48b39da1..b210e93f 100644
--- a/shared/cairo-util.c
+++ b/shared/cairo-util.c
@@ -691,6 +691,10 @@ theme_get_location(struct theme *t, int x, int y,
 void
 cleanup_after_cairo(void)
 {
+	/* some clients, particular weston-editor, still creates indirectly a
+	 * new font map; this makes sure we untie that up and avoid an assert
+	 * from cairo */
+	pango_cairo_font_map_set_default(NULL);
 	cairo_debug_reset_static_data();
 #ifdef HAVE_PANGO
 	FcFini();