diff --git a/src/mono/mono/mini/aot-compiler.c b/src/mono/mono/mini/aot-compiler.c
index 8e9cdc6120f4bd..465062d04c7f9d 100644
--- a/src/mono/mono/mini/aot-compiler.c
+++ b/src/mono/mono/mini/aot-compiler.c
@@ -4545,7 +4545,7 @@ get_runtime_invoke (MonoAotCompile *acfg, MonoMethod *method, gboolean virtual_)
 }
 
 static gboolean
-can_marshal_struct (MonoClass *klass)
+can_marshal_struct_internal (MonoClass *klass, int depth)
 {
 	MonoClassField *field;
 	gboolean can_marshal = TRUE;
@@ -4555,6 +4555,15 @@ can_marshal_struct (MonoClass *klass)
 	if (mono_class_is_auto_layout (klass))
 		return FALSE;
 
+	/*
+	 * Guard against runaway recursion for self-referential or cyclic layout types: a
+	 * reference-class field can point back to its declaring class, directly or indirectly.
+	 * Such a type cannot be marshalled as a flat struct anyway, so treat it as
+	 * non-marshalable instead of overflowing the stack.
+	 */
+	if (depth > 32)
+		return FALSE;
+
 	info = mono_marshal_load_type_info (klass);
 
 	/* Only allow a few field types to avoid asserts in the marshalling code */
@@ -4581,7 +4590,17 @@ can_marshal_struct (MonoClass *klass)
 		case MONO_TYPE_STRING:
 			break;
 		case MONO_TYPE_VALUETYPE:
-			if (!m_class_is_enumtype (mono_class_from_mono_type_internal (field->type)) && !can_marshal_struct (mono_class_from_mono_type_internal (field->type)))
+			if (!m_class_is_enumtype (mono_class_from_mono_type_internal (field->type)) && !can_marshal_struct_internal (mono_class_from_mono_type_internal (field->type), depth + 1))
+				can_marshal = FALSE;
+			break;
+		case MONO_TYPE_CLASS:
+			/*
+			 * A field whose type is a non-auto-layout (sequential/explicit) class is marshalled
+			 * as an embedded struct, the same way the runtime marshalling code handles it. Allow it
+			 * if the nested class is itself marshalable; otherwise the StructureToPtr/PtrToStructure
+			 * wrappers are not AOT compiled and full-AOT fails with a JIT-in-aot-only error.
+			 */
+			if (!can_marshal_struct_internal (mono_class_from_mono_type_internal (field->type), depth + 1))
 				can_marshal = FALSE;
 			break;
 		case MONO_TYPE_SZARRAY: {
@@ -4611,6 +4630,12 @@ can_marshal_struct (MonoClass *klass)
 	return can_marshal;
 }
 
+static gboolean
+can_marshal_struct (MonoClass *klass)
+{
+	return can_marshal_struct_internal (klass, 0);
+}
+
 /* Create a ref shared instantiation */
 static void
 create_ref_shared_inst (MonoAotCompile *acfg, MonoMethod *method, MonoGenericContext *ctx)
diff --git a/src/tests/JIT/Regression/JitBlue/WPF_3226/CSharpRepro/WPF_3226.cs b/src/tests/JIT/Regression/JitBlue/WPF_3226/CSharpRepro/WPF_3226.cs
index 51106edc3fb893..d958abe234da5e 100644
--- a/src/tests/JIT/Regression/JitBlue/WPF_3226/CSharpRepro/WPF_3226.cs
+++ b/src/tests/JIT/Regression/JitBlue/WPF_3226/CSharpRepro/WPF_3226.cs
@@ -38,7 +38,6 @@ static void WmGetMinMaxInfo(IntPtr lParam)
         Marshal.StructureToPtr(mmi, lParam, true);
     }
 
-    [ActiveIssue("https://github.com/dotnet/runtime/issues/129508", TestRuntimes.Mono)]
     [Fact]
     public unsafe static int TestEntryPoint()
     {