diff --git a/Dockerfile b/Dockerfile
index 5e7a293..4a110b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,4 +25,7 @@ COPY --from=strip-dev-deps /app ./
 COPY --from=frontend-compiler /app/frontend/public ./frontend/public
 RUN echo "JWT_SECRET=$(openssl rand -base64 256 | tr -d '\n')" > .env
 USER node
+USER root
+RUN mkdir /var/lib/waffle/uploads && chown -R node /var/lib/waffle/uploads
+USER node
 CMD [ "/bin/sh", "-c", "node index.js" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index a621607..77ab3fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
   waffle:
     build: .
     volumes:
-      - ./tmp/uploads:/var/lib/waffle/uploads
+      - ./tmp/uploads:/var/lib/waffle
     ports:
       - "5002:3000"
     environment:
@@ -19,7 +19,7 @@ services:
       - PGHOST=waffle-postgres
       - PGPASSWORD=supersecretpassword11
       - PGDATABASE=waffle
-      - AVATAR_UPLOADS_DIR=/var/lib/waffle/uploads
-      - ATTACHMENT_UPLOADS_DIR=/var/lib/waffle/uploads
+      - AVATAR_UPLOADS_DIR=/var/lib/waffle/uploads/avatar
+      - ATTACHMENT_UPLOADS_DIR=/var/lib/waffle/uploads/attachment
     depends_on:
       - waffle-postgres
diff --git a/src/gateway/index.ts b/src/gateway/index.ts
index 7148120..71a3e47 100644
--- a/src/gateway/index.ts
+++ b/src/gateway/index.ts
@@ -232,7 +232,7 @@ export class GatewayClient {
     }
 
     getPresenceEntry(status: GatewayPresenceStatus): GatewayPresenceEntry | null {
-        if (!this.user || !this.ready) {
+        if (!this.user) {
             return null;
         }