diff --git a/typescript/client/src/components/activity/Activity.tsx b/typescript/client/src/components/activity/Activity.tsx
index 4af7c4e75..60cbe0cb5 100644
--- a/typescript/client/src/components/activity/Activity.tsx
+++ b/typescript/client/src/components/activity/Activity.tsx
@@ -31,7 +31,7 @@ import { ClumpActivity, GetUsers } from "#util/activity";
 import { APIFetchV1 } from "#util/api";
 import { ONE_HOUR } from "#util/constants/time";
 import { CreateScoreIDMap, CreateUserMap } from "#util/data";
-import { NO_OP, TruncateString } from "#util/misc";
+import { NO_OP, TruncateString, UppercaseFirst } from "#util/misc";
 import { FormatTime, MillisToSince } from "#util/time";
 import React, { useContext, useEffect, useState } from "react";
 import { Button, Col, Row } from "react-bootstrap";
@@ -689,12 +689,18 @@ function ClassAchievementActivity({
 									<UGPTLink game={classGame} reqUser={user} />{" "}
 									{data.source === "manual" ? (
 										<>
-											manually set{" "}
-											<ClassBadge
-												classSet={data.classSet}
-												classValue={data.classValue}
-												game={classGame}
-											/>
+											{data.classValue ? (
+												<>
+													manually set{" "}
+													<ClassBadge
+														classSet={data.classSet}
+														classValue={data.classValue}
+														game={classGame}
+													/>
+												</>
+											) : (
+												`manually unset ${UppercaseFirst(data.classSet)}`
+											)}
 											{shouldShowGame && ` in ${FormatGame(classGame)}`}
 											{data.classOldValue !== null && (
 												<>
diff --git a/typescript/client/src/components/user/UGPTStatsOverview.tsx b/typescript/client/src/components/user/UGPTStatsOverview.tsx
index 60ed8e250..004c52178 100644
--- a/typescript/client/src/components/user/UGPTStatsOverview.tsx
+++ b/typescript/client/src/components/user/UGPTStatsOverview.tsx
@@ -28,7 +28,7 @@ export default function UGPTRatingsTable({ ugs }: { ugs: UserGameStats }) {
 			<>
 				{(Object.keys(gameConfig.classes) as Classes[V3Game][])
 					.sort(StrSOV((x) => x[0]))
-					.filter((k) => ugs.classes[k] !== undefined)
+					.filter((k) => ugs.classes[k] !== undefined && ugs.classes[k] !== null)
 					.map((k) => (
 						<tr key={k}>
 							<td>{UppercaseFirst(k)}</td>