diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 73680b05d21..180f8bcaee4 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -31,7 +31,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 8
+#define BLENDER_FILE_SUBVERSION 9
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and cancel loading the file, showing a warning to
diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc
index b6b1d04c603..b30aa208d73 100644
--- a/source/blender/blenloader/intern/versioning_userdef.cc
+++ b/source/blender/blenloader/intern/versioning_userdef.cc
@@ -1357,24 +1357,6 @@ void blo_do_versions_userdef(UserDef *userdef)
     userdef->sequencer_editor_flag |= USER_SEQ_ED_CONNECT_STRIPS_BY_DEFAULT;
   }
 
-  if (!USER_VERSION_ATLEAST(403, 33)) {
-
-    LISTBASE_FOREACH (wmKeyMap *, keymap, &userdef->user_keymaps) {
-      if (STREQ("Sculpt", keymap->idname)) {
-        keymap_update_mesh_sculpt_brushes(keymap);
-      }
-      else if (STREQ("Vertex Paint", keymap->idname)) {
-        keymap_update_mesh_vertex_paint_brushes(keymap);
-      }
-      else if (STREQ("Weight Paint", keymap->idname)) {
-        keymap_update_mesh_weight_paint_brushes(keymap);
-      }
-      else if (STREQ("Image Paint", keymap->idname)) {
-        keymap_update_mesh_texture_paint_brushes(keymap);
-      }
-    }
-  }
-
   if (!USER_VERSION_ATLEAST(404, 3)) {
     userdef->uiflag &= ~USER_FILTER_BRUSHES_BY_TOOL;
 
@@ -1393,6 +1375,23 @@ void blo_do_versions_userdef(UserDef *userdef)
         userdef, "VIEW3D_AST_brush_gpencil_sculpt", "Brushes/Grease Pencil Sculpt/Utilities");
   }
 
+  if (!USER_VERSION_ATLEAST(404, 9)) {
+    LISTBASE_FOREACH (wmKeyMap *, keymap, &userdef->user_keymaps) {
+      if (STREQ("Sculpt", keymap->idname)) {
+        keymap_update_mesh_sculpt_brushes(keymap);
+      }
+      else if (STREQ("Vertex Paint", keymap->idname)) {
+        keymap_update_mesh_vertex_paint_brushes(keymap);
+      }
+      else if (STREQ("Weight Paint", keymap->idname)) {
+        keymap_update_mesh_weight_paint_brushes(keymap);
+      }
+      else if (STREQ("Image Paint", keymap->idname)) {
+        keymap_update_mesh_texture_paint_brushes(keymap);
+      }
+    }
+  }
+
   /**
    * Always bump subversion in BKE_blender_version.h when adding versioning
    * code here, and wrap it inside a USER_VERSION_ATLEAST check.