diff --git a/ui/console-src/modules/contents/attachments/AttachmentList.vue b/ui/console-src/modules/contents/attachments/AttachmentList.vue
index f897d9343..051cbcaf6 100644
--- a/ui/console-src/modules/contents/attachments/AttachmentList.vue
+++ b/ui/console-src/modules/contents/attachments/AttachmentList.vue
@@ -249,7 +249,14 @@ const thumbnailsVisible = ref(false);
       </span>
     </template>
   </AttachmentDetailModal>
-  <AttachmentUploadModal v-if="uploadVisible" @close="onUploadModalClose" />
+  <AttachmentUploadModal
+    v-if="uploadVisible"
+    :initial-group-name="
+      selectedGroup === 'ungrouped' ? undefined : selectedGroup
+    "
+    :initial-policy-name="selectedPolicy"
+    @close="onUploadModalClose"
+  />
   <AttachmentPoliciesModal
     v-if="policyVisible"
     @close="policyVisible = false"
diff --git a/ui/console-src/modules/contents/attachments/components/AttachmentUploadModal.vue b/ui/console-src/modules/contents/attachments/components/AttachmentUploadModal.vue
index deda21efa..74330d40d 100644
--- a/ui/console-src/modules/contents/attachments/components/AttachmentUploadModal.vue
+++ b/ui/console-src/modules/contents/attachments/components/AttachmentUploadModal.vue
@@ -9,7 +9,6 @@ import {
   VTabItem,
   VTabs,
 } from "@halo-dev/components";
-import { useLocalStorage } from "@vueuse/core";
 import { onMounted, ref } from "vue";
 import { useFetchAttachmentGroup } from "../composables/use-attachment-group";
 import {
@@ -22,6 +21,11 @@ import AttachmentPolicyBadge from "./AttachmentPolicyBadge.vue";
 import AttachmentPolicyEditingModal from "./AttachmentPolicyEditingModal.vue";
 import UploadFromUrl from "./UploadFromUrl.vue";
 
+const { initialPolicyName, initialGroupName } = defineProps<{
+  initialPolicyName?: string;
+  initialGroupName?: string;
+}>();
+
 const emit = defineEmits<{
   (event: "close"): void;
 }>();
@@ -31,8 +35,8 @@ const { policies, handleFetchPolicies } = useFetchAttachmentPolicy();
 const { policyTemplates } = useFetchAttachmentPolicyTemplate();
 
 const modal = ref<InstanceType<typeof VModal> | null>(null);
-const selectedGroupName = useLocalStorage("attachment-upload-group", "");
-const selectedPolicyName = useLocalStorage("attachment-upload-policy", "");
+const selectedGroupName = ref(initialGroupName || "");
+const selectedPolicyName = ref(initialPolicyName);
 const policyEditingModal = ref(false);
 const groupEditingModal = ref(false);
 const policyTemplateNameToCreate = ref();
diff --git a/ui/console-src/modules/contents/attachments/components/UploadFromUrl.vue b/ui/console-src/modules/contents/attachments/components/UploadFromUrl.vue
index d80bf9d43..821b7368f 100644
--- a/ui/console-src/modules/contents/attachments/components/UploadFromUrl.vue
+++ b/ui/console-src/modules/contents/attachments/components/UploadFromUrl.vue
@@ -10,10 +10,13 @@ const { t } = useI18n();
 
 const props = withDefaults(
   defineProps<{
-    policyName: string;
-    groupName: string;
+    policyName?: string;
+    groupName?: string;
   }>(),
-  {}
+  {
+    policyName: undefined,
+    groupName: undefined,
+  }
 );
 
 onMounted(() => {
@@ -26,6 +29,10 @@ async function onSubmit(data: { url: string }) {
   try {
     downloading.value = true;
 
+    if (!props.policyName) {
+      throw new Error("Policy name is required");
+    }
+
     await consoleApiClient.storage.attachment.externalTransferAttachment({
       uploadFromUrlRequest: {
         url: data.url,
diff --git a/ui/console-src/modules/contents/attachments/components/selector-providers/CoreSelectorProvider.vue b/ui/console-src/modules/contents/attachments/components/selector-providers/CoreSelectorProvider.vue
index f469af09d..064e863ad 100644
--- a/ui/console-src/modules/contents/attachments/components/selector-providers/CoreSelectorProvider.vue
+++ b/ui/console-src/modules/contents/attachments/components/selector-providers/CoreSelectorProvider.vue
@@ -413,7 +413,14 @@ const viewType = useLocalStorage("attachment-selector-view-type", "grid");
       :size-options="[60, 120, 200]"
     />
   </div>
-  <AttachmentUploadModal v-if="uploadVisible" @close="onUploadModalClose" />
+  <AttachmentUploadModal
+    v-if="uploadVisible"
+    :initial-group-name="
+      selectedGroup === 'ungrouped' ? undefined : selectedGroup
+    "
+    :initial-policy-name="selectedPolicy"
+    @close="onUploadModalClose"
+  />
   <AttachmentDetailModal
     v-if="selectedAttachment"
     :mount-to-body="true"