diff --git a/src/components/popup/SurveySaleSubmitPopup.tsx b/src/components/popup/SurveySaleSubmitPopup.tsx
index eba8bb1..89df985 100644
--- a/src/components/popup/SurveySaleSubmitPopup.tsx
+++ b/src/components/popup/SurveySaleSubmitPopup.tsx
@@ -101,7 +101,7 @@ export default function SurveySaleSubmitPopup() {
   const FORM_FIELDS: FormField[] = [
     { id: 'sender', name: '発送者', required: true },
     { id: 'saleBase', name: '提出地点選択', required: session?.role === 'Admin' },
-    { id: 'targetNm', name: '提出販売店', required: session?.role !== 'Admin' },
+    { id: 'targetNm', name: '提出販売店', required: session?.role !== 'Admin' && session?.role !== 'T01' },
     { id: 'receiver', name: '受信者', required: true },
     { id: 'reference', name: '参考', required: false },
     { id: 'title', name: 'タイトル', required: true },
diff --git a/src/components/survey-sale/detail/ButtonForm.tsx b/src/components/survey-sale/detail/ButtonForm.tsx
index 479a85d..535aa03 100644
--- a/src/components/survey-sale/detail/ButtonForm.tsx
+++ b/src/components/survey-sale/detail/ButtonForm.tsx
@@ -72,7 +72,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) {
     const isReceiver =
       session?.storeId === basicData.submissionTargetId ||
       session?.storeNm === basicData.submissionTargetNm ||
-      (session?.role === 'T01' && basicData.submissionTargetNm === ADMIN_SUBMIT_TARGET_NM)
+      (session?.role === 'T01' && basicData.submissionStatus && basicData.submissionTargetId === null && basicData.submissionTargetNm !== null)
 
     return { isSubmiter, isWriter, isReceiver }
   }
@@ -258,7 +258,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) {
             <ListButton />
             <TempButton handleSave={() => handleSave(true, false)} />
             <SaveButton handleSave={() => handleSave(false, false)} />
-            {session?.role === 'T01' || isSubmit ? null : <SubmitButton handleSubmit={handleSubmit} />}
+            {!isSubmit && permissions.isSubmiter && <SubmitButton handleSubmit={handleSubmit} />}
           </div>
         </div>
       )}