diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c
index 01ee18f0..8a3ce0de 100644
--- a/libweston/compositor-fbdev.c
+++ b/libweston/compositor-fbdev.c
@@ -485,11 +485,9 @@ fbdev_output_disable_handler(struct weston_output *base)
 	if (!base->enabled)
 		return 0;
 
+	pixman_renderer_output_destroy(&output->base);
 	fbdev_frame_buffer_unmap(output);
 
-	if (base->renderer_state != NULL)
-		pixman_renderer_output_destroy(base);
-
 	return 0;
 }