diff --git a/src/Components/Assets/AssetManage.tsx b/src/Components/Assets/AssetManage.tsx
index 23098bff22f..4f65bc6a569 100644
--- a/src/Components/Assets/AssetManage.tsx
+++ b/src/Components/Assets/AssetManage.tsx
@@ -432,20 +432,24 @@ const AssetManage = (props: AssetManageProps) => {
                 <CareIcon className="care-l-pen mr-1 h-4" />
                 {t("update")}
               </ButtonV2>
-              {asset?.asset_class && (
-                <ButtonV2
-                  onClick={() =>
-                    navigate(
-                      `/facility/${asset?.location_object.facility.id}/assets/${asset?.id}/configure`
-                    )
-                  }
-                  id="configure-asset"
-                  data-testid="asset-configure-button"
-                >
-                  <CareIcon className="care-l-setting h-4" />
-                  {t("configure")}
-                </ButtonV2>
-              )}
+              {asset?.asset_class &&
+                (asset?.asset_class !== "ONVIF" ||
+                  ["DistrictAdmin", "StateAdmin", "Doctor"].includes(
+                    authUser.user_type
+                  )) && (
+                  <ButtonV2
+                    onClick={() =>
+                      navigate(
+                        `/facility/${asset?.location_object.facility.id}/assets/${asset?.id}/configure`
+                      )
+                    }
+                    id="configure-asset"
+                    data-testid="asset-configure-button"
+                  >
+                    <CareIcon className="care-l-setting h-4" />
+                    {t("configure")}
+                  </ButtonV2>
+                )}
               {checkAuthority(authUser.user_type, "DistrictAdmin") && (
                 <ButtonV2
                   authorizeFor={NonReadOnlyUsers}
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index d21200543c3..cedb1a843d3 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -506,10 +506,13 @@ export const ConsultationDetails = (props: any) => {
                 {CONSULTATION_TABS.map((p: OptionsType) => {
                   if (p.text === "FEED") {
                     if (
-                      !consultationData?.current_bed?.bed_object?.id ??
-                      consultationData?.discharge_date !== null
+                      consultationData?.discharge_date || // Discharged
+                      !consultationData?.current_bed?.bed_object?.id || // Not admitted to bed
+                      !["DistrictAdmin", "StateAdmin", "Doctor"].includes(
+                        authUser.user_type
+                      ) // Not admin or doctor
                     )
-                      return null;
+                      return null; // Hide feed tab
                   }
                   return (
                     <Link