diff --git a/src/main/services/user/get-user-data.ts b/src/main/services/user/get-user-data.ts
index 04675913..383aafa8 100644
--- a/src/main/services/user/get-user-data.ts
+++ b/src/main/services/user/get-user-data.ts
@@ -11,8 +11,7 @@ import { db } from "@main/level";
 import { levelKeys } from "@main/level/sublevels";
 
 export const getUserData = async () => {
-  // Get user language preference for API call
-  let language = "en"; // Default fallback
+  let language = "en"; 
   try {
     const userPreferences = await db.get<string, UserPreferences | null>(
       levelKeys.userPreferences,
@@ -20,7 +19,6 @@ export const getUserData = async () => {
     );
 
     if (userPreferences?.language) {
-      // Map supported languages (pt, ru, es) or fallback to en
       const supportedLanguages = ["pt", "ru", "es"];
       const userLang = userPreferences.language.split("-")[0];
       language = supportedLanguages.includes(userLang) ? userLang : "en";
diff --git a/src/renderer/src/components/fullscreen-image-modal/fullscreen-image-modal.tsx b/src/renderer/src/components/fullscreen-image-modal/fullscreen-image-modal.tsx
index d2d40960..32cae5d3 100644
--- a/src/renderer/src/components/fullscreen-image-modal/fullscreen-image-modal.tsx
+++ b/src/renderer/src/components/fullscreen-image-modal/fullscreen-image-modal.tsx
@@ -36,11 +36,7 @@ export function FullscreenImageModal({
   if (!isOpen) return null;
 
   return (
-    <dialog
-      className="fullscreen-image-modal"
-      aria-modal="true"
-      open
-    >
+    <dialog className="fullscreen-image-modal" aria-modal="true" open>
       <button
         type="button"
         className="fullscreen-image-modal__backdrop"
diff --git a/src/renderer/src/pages/achievements/achievement-list.tsx b/src/renderer/src/pages/achievements/achievement-list.tsx
index 4ba499f1..22b768d4 100644
--- a/src/renderer/src/pages/achievements/achievement-list.tsx
+++ b/src/renderer/src/pages/achievements/achievement-list.tsx
@@ -70,6 +70,7 @@ export function AchievementList({
                     type="button"
                     className="achievements__item-image-button"
                     onClick={() =>
+                      achievement.achievementImageUrl &&
                       handleImageClick(
                         achievement.achievementImageUrl,
                         achievement.displayName