diff --git a/ui/app/api/peers/route.ts b/ui/app/api/peers/route.ts
index 940663b5bc..29c687e0fc 100644
--- a/ui/app/api/peers/route.ts
+++ b/ui/app/api/peers/route.ts
@@ -22,6 +22,8 @@ import {
   ValidatePeerRequest,
   ValidatePeerResponse,
   ValidatePeerStatus,
+  createPeerStatusFromJSON,
+  validatePeerStatusFromJSON,
 } from '@/grpc_generated/route';
 import { GetFlowHttpAddressFromEnv } from '@/rpc/http';
 
@@ -65,7 +67,9 @@ export async function POST(request: Request) {
       return res.json();
     });
     let response: UValidatePeerResponse = {
-      valid: validateStatus.status === ValidatePeerStatus.VALID,
+      valid:
+        validatePeerStatusFromJSON(validateStatus.status) ===
+        ValidatePeerStatus.VALID,
       message: validateStatus.message,
     };
     return new Response(JSON.stringify(response));
@@ -81,7 +85,9 @@ export async function POST(request: Request) {
       return res.json();
     });
     let response: UCreatePeerResponse = {
-      created: createStatus.status === CreatePeerStatus.CREATED,
+      created:
+        createPeerStatusFromJSON(createStatus.status) ===
+        CreatePeerStatus.CREATED,
       message: createStatus.message,
     };
     return new Response(JSON.stringify(response));
diff --git a/ui/app/peers/create/[peerType]/handlers.ts b/ui/app/peers/create/[peerType]/handlers.ts
index e0744d9834..0d09255528 100644
--- a/ui/app/peers/create/[peerType]/handlers.ts
+++ b/ui/app/peers/create/[peerType]/handlers.ts
@@ -61,9 +61,8 @@ export const handleValidate = async (
     setMessage({ ok: false, msg: valid.message });
     setLoading(false);
     return;
-  } else {
-    setMessage({ ok: true, msg: 'Peer is valid' });
   }
+  setMessage({ ok: true, msg: 'Peer is valid' });
   setLoading(false);
 };
 
diff --git a/ui/app/peers/create/[peerType]/page.tsx b/ui/app/peers/create/[peerType]/page.tsx
index 5f09ee4e6a..01af2b0dd1 100644
--- a/ui/app/peers/create/[peerType]/page.tsx
+++ b/ui/app/peers/create/[peerType]/page.tsx
@@ -133,7 +133,7 @@ export default function CreateConfig({
           {!loading && formMessage.msg.length > 0 && (
             <Label
               colorName='lowContrast'
-              colorSet={formMessage.ok ? 'positive' : 'destructive'}
+              colorSet={formMessage.ok === true ? 'positive' : 'destructive'}
               variant='subheadline'
             >
               {formMessage.msg}