diff --git a/server/private/routers/healthChecks/listHealthChecks.ts b/server/private/routers/healthChecks/listHealthChecks.ts
index e156573e4..e87525a3f 100644
--- a/server/private/routers/healthChecks/listHealthChecks.ts
+++ b/server/private/routers/healthChecks/listHealthChecks.ts
@@ -17,7 +17,7 @@ import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
-import { and, eq, like, sql } from "drizzle-orm";
+import { and, eq, isNotNull, like, sql } from "drizzle-orm";
 import { NextFunction, Request, Response } from "express";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
@@ -85,6 +85,7 @@ export async function listHealthChecks(
 
         const whereClause = and(
             eq(targetHealthCheck.orgId, orgId),
+            isNotNull(targetHealthCheck.hcMode), // filter out the null ones attached to targets
             query
                 ? like(
                       sql`LOWER(${targetHealthCheck.name})`,
diff --git a/src/components/HealthChecksTable.tsx b/src/components/HealthChecksTable.tsx
index 63b48c53a..510639b46 100644
--- a/src/components/HealthChecksTable.tsx
+++ b/src/components/HealthChecksTable.tsx
@@ -329,7 +329,7 @@ export default function HealthChecksTable({
                             </DropdownMenuTrigger>
                             <DropdownMenuContent align="end">
                                 <DropdownMenuItem
-                                    disabled={!isPaid}
+                                    disabled={!isPaid || !!r.resourceId}
                                     onClick={() => {
                                         setSelected(r);
                                         setDeleteOpen(true);
@@ -339,18 +339,31 @@ export default function HealthChecksTable({
                                         {t("delete")}
                                     </span>
                                 </DropdownMenuItem>
+
                             </DropdownMenuContent>
                         </DropdownMenu>
-                        <Button
-                            variant="outline"
-                            disabled={!isPaid}
-                            onClick={() => {
-                                setSelected(r);
-                                setCredenzaOpen(true);
-                            }}
-                        >
-                            {t("edit")}
-                        </Button>
+                        {r.resourceId && r.resourceName && r.resourceNiceId ? (
+                            <Link href={`/${orgId}/settings/resources/proxy/${r.resourceNiceId}`}>
+                                <Button
+                                    variant="outline"
+                                    disabled={!isPaid}
+                                >
+                                    {t("edit")}
+                                </Button>
+                            </Link>
+                        ) : (
+                            <Button
+                                variant="outline"
+                                disabled={!isPaid}
+                                onClick={() => {
+                                    setSelected(r);
+                                    setCredenzaOpen(true);
+                                }}
+                            >
+                                {t("edit")}
+                            </Button>
+                        )}
+
                     </div>
                 );
             }