diff --git a/prdoc/pr_5941.prdoc b/prdoc/pr_5941.prdoc
new file mode 100644
index 0000000000000..4e88400f4ef07
--- /dev/null
+++ b/prdoc/pr_5941.prdoc
@@ -0,0 +1,16 @@
+title: "`SolochainDefaultConfig`: Use correct `AccountData`"
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      `SolochainDefaultConfig` by default was setting `AccountData` to `AccountInfo`.
+      Thus, the actual account data was recursively nested the same type. By default
+      it should be set `()`, because this is the only reasonable `AccountData`. 
+
+      If you have used `SolochainDefaultConfig` before and did not overwrite, `AccountData`
+      you should now overwrite it to `AccountInfo` or you will need to write a migration to
+      change the data.
+
+crates:
+  - name: frame-system
+    bump: patch
diff --git a/substrate/frame/system/src/lib.rs b/substrate/frame/system/src/lib.rs
index 662b7f1a94bfd..a5c5f1ed2e470 100644
--- a/substrate/frame/system/src/lib.rs
+++ b/substrate/frame/system/src/lib.rs
@@ -364,7 +364,7 @@ pub mod pallet {
 			type MaxConsumers = frame_support::traits::ConstU32<128>;
 
 			/// The default data to be stored in an account.
-			type AccountData = crate::AccountInfo<Self::Nonce, ()>;
+			type AccountData = ();
 
 			/// What to do if a new account is created.
 			type OnNewAccount = ();