diff --git a/legacy/ethumb/src/lib/Ethumb.c b/legacy/ethumb/src/lib/Ethumb.c
index 331d20c3f3..cd60ac04e4 100644
--- a/legacy/ethumb/src/lib/Ethumb.c
+++ b/legacy/ethumb/src/lib/Ethumb.c
@@ -384,8 +384,19 @@ ethumb_frame_set(Ethumb *e, const char *theme_file, const char *group, const cha
    frame = e->frame;
 
    if (frame)
-     edje_object_part_unswallow(frame->edje, e->img);
-   else
+     {
+	edje_object_part_unswallow(frame->edje, e->img);
+	if (!theme_file)
+	  _ethumb_frame_free(frame);
+     }
+
+   if (!theme_file)
+     {
+	e->frame = NULL;
+	return 1;
+     }
+
+   if (!frame)
      {
 	frame = calloc(1, sizeof(Ethumb_Frame));
 	if (!frame)