diff --git a/src/lib/elementary/efl_datetime_manager.c b/src/lib/elementary/efl_datetime_manager.c
index 24daa34217..7445b8cdee 100644
--- a/src/lib/elementary/efl_datetime_manager.c
+++ b/src/lib/elementary/efl_datetime_manager.c
@@ -22,10 +22,9 @@ typedef struct
 {
    Efl_Time time;
    char format[MAX_FORMAT_LEN];
+   Eina_Bool init;
 } Efl_Datetime_Manager_Data;
 
-Eina_Bool init = EINA_FALSE;
-
 static void
 _time_init(Efl_Time *curr_time)
 {
@@ -33,8 +32,6 @@ _time_init(Efl_Time *curr_time)
 
    t = time(NULL);
    localtime_r(&t, curr_time);
-
-   init = EINA_TRUE;
 }
 
 static char *
@@ -162,7 +159,8 @@ _efl_datetime_manager_value_set(Eo *obj EINA_UNUSED, Efl_Datetime_Manager_Data *
 EOLIAN static Efl_Time
 _efl_datetime_manager_value_get(const Eo *obj EINA_UNUSED, Efl_Datetime_Manager_Data *pd)
 {
-   if (!init) _time_init(&pd->time);
+   if (!pd->init) _time_init(&pd->time);
+   pd->init = EINA_TRUE;
 
    return pd->time;
 }
diff --git a/src/tests/elementary/spec/efl_test_basics.c b/src/tests/elementary/spec/efl_test_basics.c
index 99a441c059..b14e18a568 100644
--- a/src/tests/elementary/spec/efl_test_basics.c
+++ b/src/tests/elementary/spec/efl_test_basics.c
@@ -124,6 +124,13 @@ EFL_START_TEST(no_leaking_canvas_object)
 }
 EFL_END_TEST
 
+
+EFL_START_TEST(no_err_on_creation)
+{
+   widget = efl_add(widget_klass, win);
+}
+EFL_END_TEST
+
 EFL_START_TEST(no_err_on_shutdown)
 {
    efl_ref(widget);
@@ -204,4 +211,5 @@ efl_ui_widget_behavior_test(TCase *tc)
    tcase_add_test(tc, no_leaking_canvas_object);
    tcase_add_test(tc, no_err_on_shutdown);
    tcase_add_test(tc, correct_visibility_setting);
+   tcase_add_test(tc, no_err_on_creation);
 }