diff --git a/source/blender/animrig/intern/action.cc b/source/blender/animrig/intern/action.cc
index 38eaa1590eb..116c18cebe5 100644
--- a/source/blender/animrig/intern/action.cc
+++ b/source/blender/animrig/intern/action.cc
@@ -2229,7 +2229,9 @@ FCurve *action_fcurve_ensure(Main *bmain,
   }
   Action &action = act->wrap();
 
-  if (USER_EXPERIMENTAL_TEST(&U, use_animation_baklava) && action.is_action_layered()) {
+  if ((USER_EXPERIMENTAL_TEST(&U, use_animation_baklava) && action.is_empty()) ||
+      !action.is_action_legacy())
+  {
     /* NOTE: for layered actions we require the following:
      *
      * - `ptr` is non-null.