diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c
index 1d94b81ecd..df75639672 100644
--- a/legacy/elementary/src/lib/elc_popup.c
+++ b/legacy/elementary/src/lib/elc_popup.c
@@ -532,9 +532,7 @@ _button_remove(Evas_Object *obj,
 
    evas_object_event_callback_del
      (sd->buttons[pos]->btn, EVAS_CALLBACK_DEL, _on_button_del);
-   free(sd->buttons[pos]);
-
-   sd->buttons[pos] = NULL;
+   ELM_SAFE_FREE(sd->buttons[pos], free);
    sd->button_count -= 1;
 
    if (!sd->no_shift)