diff --git a/stratosphere/creport/source/creport_debug_types.hpp b/stratosphere/creport/source/creport_debug_types.hpp
index e39520fc4..8c5661581 100644
--- a/stratosphere/creport/source/creport_debug_types.hpp
+++ b/stratosphere/creport/source/creport_debug_types.hpp
@@ -17,9 +17,15 @@
 #pragma once
 #include <switch.h>
 
-struct StackFrame {
-    u64 fp;
-    u64 lr;
+union StackFrame {
+    struct {
+        u64 fp;
+        u64 lr;
+    } frame_64;
+    struct {
+        u32 fp;
+        u32 lr;
+    } frame_32;
 };
 
 struct AttachProcessInfo {
diff --git a/stratosphere/creport/source/creport_thread_info.cpp b/stratosphere/creport/source/creport_thread_info.cpp
index 7f9e3f69a..3c05fe124 100644
--- a/stratosphere/creport/source/creport_thread_info.cpp
+++ b/stratosphere/creport/source/creport_thread_info.cpp
@@ -75,9 +75,11 @@ bool ThreadInfo::ReadFromProcess(std::map<u64, u64> &tls_map, Handle debug_handl
         return false;
     }
 
-    /* Don't try to parse stack frames if 32-bit. */
+    /* In AArch32 mode the LR, FP, and SP registers aren't set correctly in the ThreadContext by svcGetDebugThreadParam... */
     if (!is_64_bit) {
-        return true;
+        this->context.fp = this->context.cpu_gprs[11].x;
+        this->context.sp = this->context.cpu_gprs[13].x;
+        this->context.lr = this->context.cpu_gprs[14].x;
     }
 
     /* Parse information from TLS if present. */
@@ -104,21 +106,41 @@ bool ThreadInfo::ReadFromProcess(std::map<u64, u64> &tls_map, Handle debug_handl
     TryGetStackInfo(debug_handle);
 
     u64 cur_fp = this->context.fp;
-    for (unsigned int i = 0; i < sizeof(this->stack_trace)/sizeof(u64); i++) {
-        /* Validate the current frame. */
-        if (cur_fp == 0 || (cur_fp & 0xF)) {
-            break;
-        }
 
-        /* Read a new frame. */
-        StackFrame cur_frame;
-        if (R_FAILED(svcReadDebugProcessMemory(&cur_frame, debug_handle, cur_fp, sizeof(StackFrame)))) {
-            break;
-        }
+    if (is_64_bit) {
+        for (unsigned int i = 0; i < sizeof(this->stack_trace)/sizeof(u64); i++) {
+            /* Validate the current frame. */
+            if (cur_fp == 0 || (cur_fp & 0xF)) {
+                break;
+            }
 
-        /* Advance to the next frame. */
-        this->stack_trace[this->stack_trace_size++] = cur_frame.lr;
-        cur_fp = cur_frame.fp;
+            /* Read a new frame. */
+            StackFrame cur_frame;
+            if (R_FAILED(svcReadDebugProcessMemory(&cur_frame, debug_handle, cur_fp, sizeof(cur_frame.frame_64)))) {
+                break;
+            }
+
+            /* Advance to the next frame. */
+            this->stack_trace[this->stack_trace_size++] = cur_frame.frame_64.lr;
+            cur_fp = cur_frame.frame_64.fp;
+        }
+    } else {
+        for (unsigned int i = 0; i < sizeof(this->stack_trace)/sizeof(u64); i++) {
+            /* Validate the current frame. */
+            if (cur_fp == 0 || (cur_fp & 0x7)) {
+                break;
+            }
+
+            /* Read a new frame. */
+            StackFrame cur_frame;
+            if (R_FAILED(svcReadDebugProcessMemory(&cur_frame, debug_handle, cur_fp, sizeof(cur_frame.frame_32)))) {
+                break;
+            }
+
+            /* Advance to the next frame. */
+            this->stack_trace[this->stack_trace_size++] = cur_frame.frame_32.lr;
+            cur_fp = cur_frame.frame_32.fp;
+        }
     }
 
     return true;