diff --git a/apps/console/src/pages/organizations/compliance-page/_components/CompliancePageAliasField.tsx b/apps/console/src/pages/organizations/compliance-page/_components/CompliancePageAliasField.tsx
index 8336581c0..648dfa0b2 100644
--- a/apps/console/src/pages/organizations/compliance-page/_components/CompliancePageAliasField.tsx
+++ b/apps/console/src/pages/organizations/compliance-page/_components/CompliancePageAliasField.tsx
@@ -14,7 +14,7 @@
 
 import { useTranslate } from "@probo/i18n";
 import { Field } from "@probo/ui";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useState } from "react";
 import { graphql } from "relay-runtime";
 
 import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
@@ -52,10 +52,12 @@ export function CompliancePageAliasField(props: {
 
   const { __ } = useTranslate();
   const [value, setValue] = useState(alias ?? "");
+  const [prevAlias, setPrevAlias] = useState(alias);
 
-  useEffect(() => {
+  if (alias !== prevAlias) {
+    setPrevAlias(alias);
     setValue(alias ?? "");
-  }, [alias]);
+  }
 
   const [setResourceAlias, isSettingAlias] = useMutationWithToasts(
     setResourceAliasMutation,
diff --git a/pkg/agent/schema.go b/pkg/agent/schema.go
index 927bf99ed..68384b992 100644
--- a/pkg/agent/schema.go
+++ b/pkg/agent/schema.go
@@ -76,15 +76,19 @@ func normalizeRequiredJSON(data []byte) ([]byte, error) {
 			if err != nil {
 				return nil, err
 			}
+
 			obj["items"] = n
 		}
+
 		if addlRaw, ok := obj["additionalProperties"]; ok {
 			n, err := normalizeRequiredJSON(addlRaw)
 			if err != nil {
 				return nil, err
 			}
+
 			obj["additionalProperties"] = n
 		}
+
 		return json.Marshal(obj)
 	}
 
@@ -114,6 +118,7 @@ func normalizeRequiredJSON(data []byte) ([]byte, error) {
 			if err != nil {
 				return nil, err
 			}
+
 			required = append(required, name)
 			requiredSet[name] = true
 		}
@@ -125,6 +130,7 @@ func normalizeRequiredJSON(data []byte) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	obj["properties"] = propsData
 
 	if len(required) > 0 {
@@ -132,6 +138,7 @@ func normalizeRequiredJSON(data []byte) ([]byte, error) {
 		if err != nil {
 			return nil, err
 		}
+
 		obj["required"] = reqData
 	}
 
@@ -157,6 +164,7 @@ func makeNullableJSON(data []byte) ([]byte, error) {
 			arr, _ := json.Marshal([]string{single, "null"})
 			obj["type"] = arr
 		}
+
 		return json.Marshal(obj)
 	}
 
@@ -165,9 +173,11 @@ func makeNullableJSON(data []byte) ([]byte, error) {
 		if slices.Contains(arr, "null") {
 			return data, nil
 		}
+
 		arr = append(arr, "null")
 		nullable, _ := json.Marshal(arr)
 		obj["type"] = nullable
+
 		return json.Marshal(obj)
 	}
 
diff --git a/pkg/trust/compliance_page_service.go b/pkg/trust/compliance_page_service.go
index 65d425378..585e85a58 100644
--- a/pkg/trust/compliance_page_service.go
+++ b/pkg/trust/compliance_page_service.go
@@ -241,6 +241,7 @@ func (s *Service) RenderRobotsTxt(
 
 func (s *Service) fetchDocumentIDs(ctx context.Context, scope coredata.Scoper, orgID gid.GID) ([]string, error) {
 	seen := make(map[gid.GID]struct{})
+
 	var resourceIDs []gid.GID
 
 	appendResourceID := func(id gid.GID) {