diff --git a/server/services/achievement.ts b/server/services/achievement.ts
index 897fa5e37..3203b24a1 100644
--- a/server/services/achievement.ts
+++ b/server/services/achievement.ts
@@ -3,6 +3,7 @@ import Repository from "./repository";
 import { User } from "./types/User";
 import GuildService from "./guild";
 import UserLevelService from "./userLevel";
+import {nullObject} from "./utils";
 
 export default class AchievementService {
     
@@ -32,6 +33,19 @@ export default class AchievementService {
             user.level = this.userLevelService.getByRankPoints(user.achievements.rank);
         }
 
+        // TODO: Fix this properly
+
+        if (user?.achievements) {
+            nullObject(user.achievements.combat.kills);
+            nullObject(user.achievements.combat.homeStars);
+            nullObject(user.achievements.combat.losses);
+            nullObject(user.achievements.combat.stars);
+            nullObject(user.achievements.badges);
+            nullObject(user.achievements.infrastructure);
+            nullObject(user.achievements.trade);
+            nullObject(user.achievements.research);
+        }
+
         if (user && user.guildId) {
             return {
                 ...user,
diff --git a/server/services/badge.ts b/server/services/badge.ts
index fb171d8aa..caad47bfe 100644
--- a/server/services/badge.ts
+++ b/server/services/badge.ts
@@ -39,6 +39,9 @@ export default class BadgeService extends EventEmitter {
     }
 
     async listBadgesByUser(userId: DBObjectId): Promise<UserBadge[]> {
+        return [];
+
+        /*
         const badges = this.listBadges();
 
         const user = await this.userService.getById(userId, {
@@ -58,10 +61,13 @@ export default class BadgeService extends EventEmitter {
             });
         }
 
-        return userBadges.filter(b => b.awarded);
+        return userBadges.filter(b => b.awarded);*/
     }
 
     async listBadgesByPlayer(game: Game, playerId: DBObjectId) {
+        return [];
+
+        /*
         let player = this.playerService.getById(game, playerId);
 
         if (!player) {
@@ -78,6 +84,8 @@ export default class BadgeService extends EventEmitter {
         }
 
         return await this.listBadgesByUser(player.userId);
+
+         */
     }
 
     async purchaseBadgeForUser(purchasedByUserId: DBObjectId, purchasedForUserId: DBObjectId, badgeKey: string) {
diff --git a/server/services/utils.ts b/server/services/utils.ts
index 336fe48e4..48b8e07b9 100644
--- a/server/services/utils.ts
+++ b/server/services/utils.ts
@@ -63,4 +63,10 @@ export function shuffle<T>(rand: RandomGen, a: Array<T>) {
         [a[i], a[j]] = [a[j], a[i]];
     }
     return a;
+}
+
+export const nullObject = (obj: Object) => {
+    for (let key of Object.keys(obj)) {
+        obj[key] = 0;
+    }
 }
\ No newline at end of file