diff --git a/src/components/Common/Avatar.svelte b/src/components/Common/Avatar.svelte
index 23664cb..b1da8a4 100644
--- a/src/components/Common/Avatar.svelte
+++ b/src/components/Common/Avatar.svelte
@@ -1,14 +1,22 @@
 <script>
-  import {opt} from '../../utils/js'
+  import { opt } from '../../utils/js';
 
   export let player;
 
-  $: avatar = opt(player, 'playerInfo.avatar')
+  const avatar = opt(player, 'playerInfo.avatar')
+
+  // TEMP WORKAROUND UNTIL I MIGRATE TO NEW SS API
+  export let avatarr;
+  if (avatar.includes("oculus")) {
+    avatarr = "https://cdn.scoresaber.com/avatars/oculus.png"
+  } else {
+    avatarr = `https://cdn.scoresaber.com/avatars/${player.playerId}.jpg`
+  }
 </script>
 
-{#if avatar}
+{#if avatarr}
   <figure class="image is-24x24" on:click>
-    <img src={avatar} alt=""/>
+    <img src={avatarr} alt=""/>
   </figure>
 {/if}
 
diff --git a/src/components/Player/Avatar.svelte b/src/components/Player/Avatar.svelte
index f5c8001..df7d18a 100644
--- a/src/components/Player/Avatar.svelte
+++ b/src/components/Player/Avatar.svelte
@@ -1,5 +1,6 @@
 <script>
-  import Spinner from '../Common/Spinner.svelte'
+  import { SS_CDN_HOST } from '../../network/queues/scoresaber/page-queue';
+  import Spinner from '../Common/Spinner.svelte';
 
   export let playerInfo;
   export let isLoading = false;
@@ -10,7 +11,8 @@
   <span class="no-image">?</span>
 
   {#if playerInfo && playerInfo.avatar}
-    <img src={playerInfo.avatar} class="avatar" alt="" />
+    <!-- TEMP WORKAROUND UNTIL I MIGRATE TO NEW SS API -->
+    <img src={playerInfo.avatar.replace("https://new.scoresaber.com/api/static", SS_CDN_HOST)} class="avatar" alt="" />
   {/if}
   <span class="spinner">
     <Spinner width="100%" height="100%"/>