diff --git a/frontend/src/ts/tribe/tribe-results.ts b/frontend/src/ts/tribe/tribe-results.ts
index b354012a3..c19597b61 100644
--- a/frontend/src/ts/tribe/tribe-results.ts
+++ b/frontend/src/ts/tribe/tribe-results.ts
@@ -263,19 +263,15 @@ function updateUser(page: string, userId: string): void {
 
       let otherText = "-";
       const resolve = userResult.resolve;
-      if (resolve.afk) {
-        otherText = "afk";
-      } else if (resolve.repeated) {
-        otherText = "repeated";
-      } else if (resolve.failed && !configInfinite) {
+      if ("valid" in resolve && !resolve.valid) {
+        otherText = `invalid(${resolve.invalidReason})`;
+      } else if ("failed" in resolve && resolve.failed) {
         otherText = `failed(${resolve.failedReason})`;
-      } else if (resolve.saved === false) {
+      } else if ("saved" in resolve && !resolve.saved) {
         otherText = `save failed(${resolve.saveFailedMessage})`;
-      } else if (resolve.valid === false) {
-        otherText = `invalid`;
       } else if (configInfinite) {
         otherText = `${Math.round(userResult.testDuration)}s`;
-      } else if (resolve.saved && resolve.isPb) {
+      } else if ("saved" in resolve && resolve.saved && resolve.isPb) {
         otherText = "new pb";
       }
       userEl.find(`.other .text`).text(otherText);
diff --git a/frontend/src/ts/tribe/tribe.ts b/frontend/src/ts/tribe/tribe.ts
index 3285229cd..66a58e958 100644
--- a/frontend/src/ts/tribe/tribe.ts
+++ b/frontend/src/ts/tribe/tribe.ts
@@ -697,16 +697,14 @@ TribeSocket.in.room.userResult((data) => {
   const resolve = data.result?.resolve;
   if (
     resolve === undefined ||
-    resolve?.afk ||
-    resolve?.repeated ||
-    resolve?.valid === false ||
-    resolve?.saved === false ||
-    resolve?.failed === true
+    ("valid" in resolve && !resolve.valid) ||
+    ("saved" in resolve && !resolve.saved) ||
+    ("failed" in resolve && resolve.failed)
   ) {
     //todo only one
 
     let color: ColorName | undefined = undefined;
-    if (resolve?.failed === true) {
+    if (resolve === undefined || ("failed" in resolve && resolve.failed)) {
       color = "colorfulError";
     }
 
@@ -716,7 +714,7 @@ TribeSocket.in.room.userResult((data) => {
     if (!TribeConfig.isConfigInfinite(room.config)) {
       TribeResults.fadeUser("result", data.userId);
     }
-    if (resolve?.afk) {
+    if (resolve === undefined || ("valid" in resolve && !resolve.valid)) {
       TribeCarets.destroy(data.userId);
     }
   } else {