diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index 4e386649d4..de1b20f3e4 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -3965,6 +3965,11 @@ _line_wrap_set(Eo *obj, void *_pd, va_list *list)
    if (sd->line_wrap == wrap) return;
    sd->last_w = -1;
    sd->line_wrap = wrap;
+   if (wrap == ELM_WRAP_NONE)
+      {
+         ecore_job_del(sd->deferred_recalc_job);
+         sd->deferred_recalc_job = NULL;
+      }
    eo_do(obj, elm_wdg_theme_apply(NULL));
 }