1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c
index bbde81a657..62f0ba1577 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -260,8 +260,8 @@ evas_thread_shutdown(void)
              goto timeout_shutdown;
           }
      }
-
-   eina_thread_join(evas_thread_worker);
+   if (!evas_thread_exited)
+     eina_thread_join(evas_thread_worker);
 timeout_shutdown:
    eina_lock_free(&evas_thread_queue_lock);
    eina_condition_free(&evas_thread_queue_condition);