diff --git a/app/src/components/domain/ShareUserItem/index.tsx b/app/src/components/domain/ShareUserItem/index.tsx
index 60eb2ba591..827b0acbe7 100644
--- a/app/src/components/domain/ShareUserItem/index.tsx
+++ b/app/src/components/domain/ShareUserItem/index.tsx
@@ -37,7 +37,7 @@ function ShareUserItem(props: Props) {
             readOnly
             spacingOffset={-2}
             spacing="sm"
-            after={(
+            after={onUserRemove && (
                 <Button
                     name={userId}
                     onClick={onUserRemove}
diff --git a/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx b/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
index 12c0c4cf52..e58c764cc8 100644
--- a/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
@@ -128,14 +128,21 @@ function Overview(props: Props) {
 
     const strings = useTranslation(i18n);
     const {
-        dref_dref_dref_type: typeOfDrefOptions,
+        dref_dref_dref_type,
         dref_dref_disaster_category: drefDisasterCategoryOptions,
         dref_dref_onset_type: drefOnsetTypeOptions,
     } = useGlobalEnums();
 
-    const typeOfDrefOptionsWithoutImminent = useMemo(() => (
-        typeOfDrefOptions?.filter((option) => option.key !== TYPE_IMMINENT)
-    ), [typeOfDrefOptions]);
+    const typeOfDrefOptions = useMemo(() => {
+        const drefOptions = dref_dref_dref_type?.filter(
+            (option) => option.key !== TYPE_LOAN,
+        );
+
+        if (!isPreviousImminent) {
+            return drefOptions?.filter((option) => option.key !== TYPE_IMMINENT);
+        }
+        return drefOptions;
+    }, [dref_dref_dref_type, isPreviousImminent]);
 
     const countryOptions = useCountry();
 
@@ -307,11 +314,7 @@ function Overview(props: Props) {
                         <SelectInput
                             name="type_of_dref"
                             label={strings.drefFormTypeOfDref}
-                            options={
-                                isPreviousImminent
-                                    ? typeOfDrefOptions
-                                    : typeOfDrefOptionsWithoutImminent
-                            }
+                            options={typeOfDrefOptions}
                             keySelector={typeOfDrefKeySelector}
                             labelSelector={stringValueSelector}
                             onChange={setFieldValue}