diff --git a/source/blender/blenkernel/intern/object_update.cc b/source/blender/blenkernel/intern/object_update.cc
index 103a7cf4287..bf12308b800 100644
--- a/source/blender/blenkernel/intern/object_update.cc
+++ b/source/blender/blenkernel/intern/object_update.cc
@@ -393,6 +393,12 @@ void BKE_object_eval_eval_base_flags(Depsgraph *depsgraph,
   ViewLayer *view_layer = static_cast<ViewLayer *>(
       BLI_findlink(&scene->view_layers, view_layer_index));
   BLI_assert(view_layer != nullptr);
+
+  // Option 1 fix
+  if (view_layer->object_bases_array == nullptr) {
+    BKE_layer_eval_view_layer_indexed(depsgraph, scene, view_layer_index);
+  }
+
   BLI_assert(view_layer->object_bases_array != nullptr);
   BLI_assert(base_index >= 0);
   BLI_assert(base_index < MEM_allocN_len(view_layer->object_bases_array) / sizeof(Base *));