diff --git a/legacy/evas/src/evas_image.c b/legacy/evas/src/evas_image.c
index 5116658701..ba038ae91d 100644
--- a/legacy/evas/src/evas_image.c
+++ b/legacy/evas/src/evas_image.c
@@ -134,6 +134,7 @@ evas_set_image_file(Evas e, Evas_Object o, char *file)
        (oo->current.image.h == 0)
        )
      {
+	_evas_free_image_renderer_data(e, o);
 	if (oo->current.file)
 	   free(oo->current.file);
 	oo->previous.file = NULL;
diff --git a/legacy/evas/src/evas_text.c b/legacy/evas/src/evas_text.c
index 6a38f7c743..566fc437f9 100644
--- a/legacy/evas/src/evas_text.c
+++ b/legacy/evas/src/evas_text.c
@@ -928,6 +928,7 @@ evas_set_font(Evas e, Evas_Object o, char *font, int size)
 	     if ((oo->current.font) && (!strcmp(oo->current.font, font))
 		 && (size == oo->current.size))
 		return;
+	     _evas_free_text_renderer_data(e, o);
 	     if (oo->current.font) free(oo->current.font);
 	     oo->current.font = strdup(font);
 	     oo->previous.font = NULL;