diff --git a/components/leaderboard-panel.tsx b/components/leaderboard-panel.tsx
index 0d61fdb..70f8a78 100644
--- a/components/leaderboard-panel.tsx
+++ b/components/leaderboard-panel.tsx
@@ -1,4 +1,3 @@
-import { useUser } from "context/user-context";
 import useBreakpoints from "hooks/use-breakpoints";
 import { isEqual } from "lodash";
 import { IXPLeaderboardUser } from "models/backend/xp-models";
@@ -9,7 +8,6 @@ import { calculateLevel, formatNumber } from "utils/text-utils";
 
 import BlockButton from "./block-button";
 import FallBackImage from "./fallback-image";
-import { ArrowDown, ArrowUp, Neutral } from "./svg/arrows";
 
 interface LeaderboardPanelProps {
   user: IXPLeaderboardUser;
@@ -18,23 +16,12 @@ interface LeaderboardPanelProps {
   isAdmin?: boolean;
 }
 
-const getArrowPos = (id: string, arrPos: number, pos: number) => {
-  return arrPos < pos ? (
-    <ArrowDown />
-  ) : arrPos > pos ? (
-    <ArrowUp />
-  ) : (
-    <Neutral />
-  );
-};
-
 const LeaderboardPanel: FC<LeaderboardPanelProps> = ({
   user,
   rank,
   requestEdit,
   isAdmin,
 }) => {
-  const userContext = useUser();
   const [hovering, setHovering] = useState(false);
   const breakpoints = useBreakpoints();
   hovering;
@@ -85,11 +72,6 @@ const LeaderboardPanel: FC<LeaderboardPanelProps> = ({
       <div className="relative hidden h-full shrink-0 items-center overflow-hidden whitespace-nowrap rounded-md bg-panelBack p-4 text-darkText shadow-md dark:bg-panelBack-darkMode dark:text-darkText-darkMode md:flex">
         {formatNumber(user.xp)} xp
       </div>
-      {!userContext.flags?.["disable-leaderboard-arrows"] && (
-        <div className="relative flex h-full shrink-0 items-center overflow-hidden whitespace-nowrap rounded-md bg-panelBack p-4 text-darkText shadow-md dark:bg-panelBack-darkMode dark:text-darkText-darkMode">
-          {getArrowPos(user.id, user.arrowPos, rank)}
-        </div>
-      )}
       {isAdmin && (
         <BlockButton
           onClick={requestEdit}
diff --git a/context/user-context.tsx b/context/user-context.tsx
index 6d72c39..e5c568d 100644
--- a/context/user-context.tsx
+++ b/context/user-context.tsx
@@ -127,7 +127,9 @@ export function UserContextProvider({
     []
   );
   const [currentUser, setCurrentUser] = useState<IXPAPIUser | undefined>();
-  const { flags } = useFlags();
+  const { flags } = useFlags(
+    currentUser ? { user: { key: currentUser?.discordUser.id } } : undefined
+  );
 
   const [inboxItems, setInboxItems] = useState<IInboxItem[]>([]);
 
diff --git a/models/backend/xp-models.ts b/models/backend/xp-models.ts
index 3c2834c..b6c4dbc 100644
--- a/models/backend/xp-models.ts
+++ b/models/backend/xp-models.ts
@@ -40,7 +40,6 @@ export interface IXPGuild {
       allowed: Array<string>;
     }>;
   };
-  arrows: { [id: string]: number };
   leaderboard_message: {
     enabled: boolean;
     messageID: string;
@@ -126,7 +125,6 @@ export interface IXPLeaderboardGuild {
 export interface IXPLeaderboardUser {
   id: string;
   xp: number;
-  arrowPos: number;
   username: string;
   avatar?: string;
   banner?: string;