diff --git a/src/lib/eo/eo_ptr_indirection.x b/src/lib/eo/eo_ptr_indirection.x
index 61fd1837be..4efe667e3c 100644
--- a/src/lib/eo/eo_ptr_indirection.x
+++ b/src/lib/eo/eo_ptr_indirection.x
@@ -392,10 +392,11 @@ _eo_id_allocate(const _Eo_Object *obj)
    if (!entry)
      {
         entry = _search_tables();
-        if (!entry)
-          return 0;
      }
 
+   if (!_current_table || !entry)
+      return 0;
+
    /* [1;max-1] thus we never generate an Eo_Id equal to 0 */
    _eo_generation_counter++;
    if (_eo_generation_counter == MAX_GENERATIONS)