diff --git a/client-src/routes/index.tsx b/client-src/routes/index.tsx
index a397afa..3b08387 100644
--- a/client-src/routes/index.tsx
+++ b/client-src/routes/index.tsx
@@ -7,6 +7,8 @@ import {
   Hat,
   SVGUploaded,
   DEFAULT_NAME,
+  DEFAULT_HAT,
+  DEFAULT_FROG,
 } from "../../isomophic-src/isomorphic";
 import UserMessage from "../views/room/UserMessage";
 import { HAT_MAP } from "../views/room/state/hats";
@@ -24,8 +26,8 @@ function Index() {
   const [userMap, setUserMap] = useState(
     {} as Record<string, { frog: Frog; hat: Hat; name: string }>,
   );
-  const [hat, setHat] = useState("/TopHatP.png");
-  const [frog, setFrog] = useState("/Frog1AP.png");
+  const [hat, setHat] = useState(HAT_MAP[DEFAULT_HAT]!);
+  const [frog, setFrog] = useState(FROG_MAP[DEFAULT_FROG]!);
   const [name, setName] = useState(DEFAULT_NAME);
 
   useEffect(() => {
diff --git a/isomophic-src/isomorphic.ts b/isomophic-src/isomorphic.ts
index edf2b5a..e82be03 100644
--- a/isomophic-src/isomorphic.ts
+++ b/isomophic-src/isomorphic.ts
@@ -1,6 +1,8 @@
 import { z } from "zod";
 
 export const DEFAULT_NAME = "frogboi";
+export const DEFAULT_HAT = "" as const;
+export const DEFAULT_FROG = "Frog1AP" as const;
 
 const UploadSVGSchema = z.object({
     type: z.literal("upload-svg"),
diff --git a/server-src/server.ts b/server-src/server.ts
index 9f18e6e..832f21f 100644
--- a/server-src/server.ts
+++ b/server-src/server.ts
@@ -4,7 +4,7 @@ import { Server } from "partyserver";
 
 import type { Connection, WSMessage } from "partyserver";
 
-import { FromClientSocketMessage, FromServerSocketMessage, Frog, Hat, DEFAULT_NAME } from "../isomophic-src/isomorphic";
+import { FromClientSocketMessage, FromServerSocketMessage, Frog, Hat, DEFAULT_NAME, DEFAULT_HAT, DEFAULT_FROG } from "../isomophic-src/isomorphic";
 
 function getMessageForClient(data: FromServerSocketMessage): string {
   return JSON.stringify(data);
@@ -49,8 +49,8 @@ export class Chat extends Server {
         break;
       }
       case "request-frog": {
-        const hat = await this.ctx.storage.get<Hat>("hat") || "";
-        const frog = await this.ctx.storage.get<Frog>("frog") || "Frog1AP";
+        const hat = await this.ctx.storage.get<Hat>("hat") || DEFAULT_HAT;
+        const frog = await this.ctx.storage.get<Frog>("frog") || DEFAULT_FROG;
         const name = await this.ctx.storage.get<string>("name") || DEFAULT_NAME;
         connection.send(getMessageForClient({
           type: "get_frog",