diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -461,9 +461,7 @@
 EAPI void
 evas_object_clip_unset(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj);
-   EVAS_OBJECT_DATA_ALIVE_CHECK(obj);
-   _clip_unset(eo_obj, obj);
+   efl_canvas_object_clipper_set(eo_obj, NULL);
 }
 
 static void