diff --git a/src/ert/storage/migration/to7.py b/src/ert/storage/migration/to7.py
index 122648c1b04..1263a76e878 100644
--- a/src/ert/storage/migration/to7.py
+++ b/src/ert/storage/migration/to7.py
@@ -96,9 +96,7 @@ def _migrate_response_datasets(path: Path) -> None:
             responses_obj is not None
         ), f"Failed to load responses.json @ {responses_file}"
 
-        gendata_keys = {
-            k for k, v in responses_obj.items() if v["_ert_kind"] == "GenDataConfig"
-        }
+        gendata_keys = responses_obj.get("gen_data", {}).get("keys", [])
 
         for ens in ensembles:
             with open(ens / "index.json", encoding="utf-8") as f:
@@ -134,5 +132,5 @@ def _migrate_response_datasets(path: Path) -> None:
 
 
 def migrate(path: Path) -> None:
-    _migrate_response_datasets(path)
     _migrate_response_configs(path)
+    _migrate_response_datasets(path)
diff --git a/tests/unit_tests/storage/snapshots/test_storage_migration/test_that_storage_matches/gen_data b/tests/unit_tests/storage/snapshots/test_storage_migration/test_that_storage_matches/gen_data
new file mode 100644
index 00000000000..197f3fe9df5
--- /dev/null
+++ b/tests/unit_tests/storage/snapshots/test_storage_migration/test_that_storage_matches/gen_data
@@ -0,0 +1,21 @@
+realization,name,report_step,index,values
+0,GEN,1,0,0.0
+0,GEN,1,1,0.1
+1,GEN,1,0,0.0
+1,GEN,1,1,0.1
+2,GEN,1,0,0.0
+2,GEN,1,1,0.1
+3,GEN,1,0,0.0
+3,GEN,1,1,0.1
+4,GEN,1,0,0.0
+4,GEN,1,1,0.1
+5,GEN,1,0,0.0
+5,GEN,1,1,0.1
+6,GEN,1,0,0.0
+6,GEN,1,1,0.1
+7,GEN,1,0,0.0
+7,GEN,1,1,0.1
+8,GEN,1,0,0.0
+8,GEN,1,1,0.1
+9,GEN,1,0,0.0
+9,GEN,1,1,0.1
diff --git a/tests/unit_tests/storage/test_storage_migration.py b/tests/unit_tests/storage/test_storage_migration.py
index 456164e6f7a..9e0e4519766 100644
--- a/tests/unit_tests/storage/test_storage_migration.py
+++ b/tests/unit_tests/storage/test_storage_migration.py
@@ -176,6 +176,14 @@ def test_that_storage_matches(
             "observations",
         )
 
+        gen_data = ensemble.load_responses(
+            "gen_data", tuple(range(ensemble.ensemble_size))
+        )
+        snapshot.assert_match(
+            gen_data.to_dataframe().to_csv(),
+            "gen_data",
+        )
+
 
 @pytest.mark.integration_test
 @pytest.mark.usefixtures("copy_shared")