diff --git a/source/blender/blenloader/intern/versioning_common.cc b/source/blender/blenloader/intern/versioning_common.cc
index 2174da5d963..35abf239742 100644
--- a/source/blender/blenloader/intern/versioning_common.cc
+++ b/source/blender/blenloader/intern/versioning_common.cc
@@ -678,13 +678,14 @@ void do_versions_after_setup(Main *new_bmain,
     BKE_main_mesh_legacy_convert_auto_smooth(*new_bmain);
   }
 
+  if (!blendfile_or_libraries_versions_atleast(new_bmain, 404, 2)) {
+    /* Version all the action assignments of just-versioned datablocks. This MUST happen before the
+     * GreasePencil conversion, as that assumes the Action Slots have already been assigned. */
+    blender::animrig::versioning::convert_legacy_action_assignments(*new_bmain, reports->reports);
+  }
+
   if (!blendfile_or_libraries_versions_atleast(new_bmain, 403, 3)) {
     /* Convert all the legacy grease pencil objects. This does not touch annotations. */
     blender::bke::greasepencil::convert::legacy_main(*new_bmain, lapp_context, *reports);
   }
-
-  if (!blendfile_or_libraries_versions_atleast(new_bmain, 404, 2)) {
-    /* Version all the action assignments of just-versioned datablocks. */
-    blender::animrig::versioning::convert_legacy_action_assignments(*new_bmain, reports->reports);
-  }
 }