diff --git a/src/database/index.js b/src/database/index.js
index 04c5e3b..e69a4c0 100644
--- a/src/database/index.js
+++ b/src/database/index.js
@@ -137,17 +137,8 @@ export const stmtBids = flopoDB.prepare(`
 stmtBids.run();
 
 export const getMarketOffers = flopoDB.prepare(`
-    SELECT market_offers.*,
-           skins.displayName AS skinName,
-           skins.displayIcon AS skinIcon,
-           seller.username   AS sellerName,
-           seller.globalName AS sellerGlobalName,
-           buyer.username    AS buyerName,
-           buyer.globalName  AS buyerGlobalName
+    SELECT *
     FROM market_offers
-             JOIN skins ON skins.uuid = market_offers.skin_uuid
-             JOIN users AS seller ON seller.id = market_offers.seller_id
-             LEFT JOIN users AS buyer ON buyer.id = market_offers.buyer_id
     ORDER BY market_offers.posted_at DESC
 `);
 
@@ -332,14 +323,14 @@ export const stmtSOTDStats = flopoDB.prepare(`
 stmtSOTDStats.run();
 
 export const getAllSOTDStats = flopoDB.prepare(`SELECT sotd_stats.*, users.globalName
-                   FROM sotd_stats
-                            JOIN users ON users.id = sotd_stats.user_id
-                   ORDER BY score DESC, moves ASC, time ASC`);
+                                                FROM sotd_stats
+                                                         JOIN users ON users.id = sotd_stats.user_id
+                                                ORDER BY score DESC, moves ASC, time ASC`);
 export const getUserSOTDStats = flopoDB.prepare(`SELECT *
                                                  FROM sotd_stats
                                                  WHERE user_id = ?`);
 export const insertSOTDStats = flopoDB.prepare(`INSERT INTO sotd_stats (id, user_id, time, moves, score)
-                   VALUES (@id, @user_id, @time, @moves, @score)`);
+                                                VALUES (@id, @user_id, @time, @moves, @score)`);
 export const clearSOTDStats = flopoDB.prepare(`DELETE
                                                FROM sotd_stats`);
 export const deleteUserSOTDStats = flopoDB.prepare(`DELETE
diff --git a/src/server/routes/market.js b/src/server/routes/market.js
index 8b55d30..40747e7 100644
--- a/src/server/routes/market.js
+++ b/src/server/routes/market.js
@@ -5,7 +5,7 @@ import express from "express";
 // --- Utility and API Imports ---
 // --- Discord.js Builder Imports ---
 import { ButtonStyle } from "discord.js";
-import { getMarketOfferById, getMarketOffers, getOfferBids } from "../../database/index.js";
+import { getMarketOfferById, getMarketOffers, getOfferBids, getSkin, getUser } from "../../database/index.js";
 
 // Create a new router instance
 const router = express.Router();
@@ -20,6 +20,11 @@ export function marketRoutes(client, io) {
 	router.get("/offers", async (req, res) => {
 		try {
 			const offers = getMarketOffers.all();
+			offers.forEach((offer) => {
+				offer.skin = getSkin.get(offer.skin_uuid);
+				offer.seller = getUser.get(offer.seller_id);
+				offer.buyer = getUser.get(offer.buyer_id) || null;
+			});
 			res.status(200).send({ offers });
 		} catch (e) {
 			res.status(500).send({ error: e });