diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d5f11335..1bf5af849 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,13 +14,14 @@ changes.
 
 ### Fixed
 
+- Fix app crash on unhandled wallet error [Issue 3123](https://github.com/IntersectMBO/govtool/issues/3123)
+
 ### Changed
 
 ### Removed
 
 ## [v2.0.21](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.21) 2025-05-09
 
-
 ### Added
 
 - Add support for the tables in markdown [Issue 3581](https://github.com/IntersectMBO/govtool/issues/3581)
diff --git a/govtool/frontend/src/components/organisms/Modal/StatusModal.tsx b/govtool/frontend/src/components/organisms/Modal/StatusModal.tsx
index 2b1e24ea6..933d73b6e 100644
--- a/govtool/frontend/src/components/organisms/Modal/StatusModal.tsx
+++ b/govtool/frontend/src/components/organisms/Modal/StatusModal.tsx
@@ -67,7 +67,7 @@ export const StatusModal = forwardRef<HTMLDivElement>((_, ref) => {
             whiteSpace: "pre-line",
           }}
         >
-          {state?.message}{" "}
+          {typeof state?.message === "string" && state?.message}
           {state?.link && (
             <Link
               onClick={() => openInNewTab(state?.link || "")}
diff --git a/govtool/frontend/src/hooks/useWalletErrorModal.tsx b/govtool/frontend/src/hooks/useWalletErrorModal.tsx
index 78f7a2896..66c500552 100644
--- a/govtool/frontend/src/hooks/useWalletErrorModal.tsx
+++ b/govtool/frontend/src/hooks/useWalletErrorModal.tsx
@@ -20,7 +20,10 @@ export const useWalletErrorModal = () => {
     buttonText,
     dataTestId,
   }: WalletErrorModalProps) => {
-    const errorMessage = (error && typeof error === 'object' && 'info' in error) ? error.info : error;
+    const errorMessage =
+      error && typeof error === "object" && "info" in error
+        ? error.info
+        : JSON.stringify(error, Object.getOwnPropertyNames(error));
 
     openModal({
       type: "statusModal",