diff --git a/src/components/records/allergy-manager.tsx b/src/components/records/allergy-manager.tsx
index f363bc5ad..bbd25e0c4 100644
--- a/src/components/records/allergy-manager.tsx
+++ b/src/components/records/allergy-manager.tsx
@@ -123,10 +123,12 @@ export function AllergyManager() {
         <p className="text-muted-foreground text-sm">
           {t("records.allergies.description")}
         </p>
-        <Button size="sm" onClick={openNew} className="shrink-0">
-          <Plus className="h-4 w-4" />
-          {t("records.allergies.add")}
-        </Button>
+        {rows.length > 0 ? (
+          <Button size="sm" onClick={openNew} className="shrink-0">
+            <Plus className="h-4 w-4" />
+            {t("records.allergies.add")}
+          </Button>
+        ) : null}
       </div>
 
       {isLoading ? (
diff --git a/src/components/records/family-history-manager.tsx b/src/components/records/family-history-manager.tsx
index 4a6cb7542..ba007a21b 100644
--- a/src/components/records/family-history-manager.tsx
+++ b/src/components/records/family-history-manager.tsx
@@ -108,10 +108,12 @@ export function FamilyHistoryManager() {
         <p className="text-muted-foreground text-sm">
           {t("records.family.description")}
         </p>
-        <Button size="sm" onClick={openNew} className="shrink-0">
-          <Plus className="h-4 w-4" />
-          {t("records.family.add")}
-        </Button>
+        {rows.length > 0 ? (
+          <Button size="sm" onClick={openNew} className="shrink-0">
+            <Plus className="h-4 w-4" />
+            {t("records.family.add")}
+          </Button>
+        ) : null}
       </div>
 
       {isLoading ? (
diff --git a/src/components/records/health-profile-facts-manager.tsx b/src/components/records/health-profile-facts-manager.tsx
index 4a42e81d7..a5cc6e2b4 100644
--- a/src/components/records/health-profile-facts-manager.tsx
+++ b/src/components/records/health-profile-facts-manager.tsx
@@ -243,9 +243,7 @@ export function HealthProfileFactsManager() {
                       aria-hidden
                     />
                   )}
-                  {current
-                    ? t("records.profileFacts.correct")
-                    : t("records.profileFacts.save")}
+                  {t("records.profileFacts.save")}
                 </Button>
                 {current ? (
                   <ConfirmButton