diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c
index 5405c0b11f..ddd96ff8ff 100644
--- a/legacy/elementary/src/lib/elm_button.c
+++ b/legacy/elementary/src/lib/elm_button.c
@@ -45,7 +45,7 @@ _activate(Evas_Object *obj)
 {
    ELM_BUTTON_DATA_GET_OR_RETURN(obj, sd);
 
-   ELM_FREE_FUNC(sd->timer, ecore_timer_del);
+   ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->repeating = EINA_FALSE;
 
    if ((_elm_config->access_mode == ELM_ACCESS_MODE_OFF) ||
@@ -220,7 +220,7 @@ _autorepeat_initial_send(void *data)
 {
    ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL);
 
-   ELM_FREE_FUNC(sd->timer, ecore_timer_del);
+   ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->repeating = EINA_TRUE;
    _autorepeat_send(data);
    sd->timer = ecore_timer_add(sd->ar_interval, _autorepeat_send, data);
@@ -256,7 +256,7 @@ _on_unpressed_signal(void *data,
 {
    ELM_BUTTON_DATA_GET_OR_RETURN(data, sd);
 
-   ELM_FREE_FUNC(sd->timer, ecore_timer_del);
+   ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->repeating = EINA_FALSE;
    evas_object_smart_callback_call(data, SIG_UNPRESSED, NULL);
 }
@@ -359,7 +359,7 @@ _autorepeat_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Eina_Bool on = va_arg(*list, int);
    Elm_Button_Smart_Data *sd = _pd;
 
-   ELM_FREE_FUNC(sd->timer, ecore_timer_del);
+   ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->autorepeat = on;
    sd->repeating = EINA_FALSE;
 }
@@ -420,7 +420,7 @@ _autorepeat_initial_timeout_set(Eo *obj, void *_pd, va_list *list)
      }
 
    if (sd->ar_threshold == t) return;
-   ELM_FREE_FUNC(sd->timer, ecore_timer_del);
+   ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->ar_threshold = t;
 }