diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index 696af89f7f..9fb682f9ee 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -6112,7 +6112,8 @@ EAPI const char * edje_edit_state_text_style_get(Evas_Object *obj, const char *p
  * @param part Part to set the style of.
  * @param state State in which the style is set.
  * @param value Value of the state.
- * @param style The style name to use.
+ * @param style The style name to use. In case when NULL style will removed from textblock part description.
+ *
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 8282700bbb..c1a2fef5eb 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -8463,7 +8463,15 @@ edje_edit_state_text_style_set(Evas_Object *obj, const char *part, const char *s
      return EINA_FALSE;
 
    txt = (Edje_Part_Description_Text *)pd;
-   _edje_if_string_replace(ed, &txt->text.style.str, style);
+   if (style == NULL )
+     {
+        _edje_if_string_free(ed, &txt->text.style.str);
+        txt->text.style.str = NULL;
+     }
+   else
+     {
+        _edje_if_string_replace(ed, &txt->text.style.str, style);
+     }
 
    edje_object_calc_force(obj);
    return EINA_TRUE;