diff --git a/src/main/java/auth_service/modules/user/persistence/mapper/EntityMapper.java b/src/main/java/auth_service/modules/user/persistence/mapper/EntityMapper.java
index 2177322..76a38f7 100644
--- a/src/main/java/auth_service/modules/user/persistence/mapper/EntityMapper.java
+++ b/src/main/java/auth_service/modules/user/persistence/mapper/EntityMapper.java
@@ -31,13 +31,16 @@ public abstract class EntityMapper {
         }
 
         // 2. Map the main user fields and attach the settings
+
+        var steamId = entity.getSteamId() == null ? 0L : entity.getSteamId();
+
         return User.builder()
                 .id(entity.getId())
                 .email(entity.getEmail())
                 .encryptedPassword(entity.getPassword())
                 .lastLogin(entity.getLastLoginDate())
                 .createdDate(entity.getRegistrationDate())
-                .steamId(entity.getSteamId())
+                .steamId(steamId)
                 .settings(settingsModel)
                 .build();
     }
@@ -49,4 +52,4 @@ public abstract class EntityMapper {
         entity.setTheme(settings.getTheme());
         return entity;
     }
-}
+}
\ No newline at end of file