diff --git a/components/DocumentUploadModal.vue b/components/DocumentUploadModal.vue
index 8d84458..700c112 100644
--- a/components/DocumentUploadModal.vue
+++ b/components/DocumentUploadModal.vue
@@ -26,8 +26,12 @@ setup()
 const uploadFiles = async () => {
   uploadInProgress.value = true;
 
+  let fileData = props.fileData
+  delete fileData.typeEnabled
 
-  await useFiles().uploadFiles(props.fileData,  document.getElementById("fileUploadInput").files,[],true)
+
+
+  await useFiles().uploadFiles(fileData,  document.getElementById("fileUploadInput").files,[],true)
 
   uploadInProgress.value = false;
   emit("uploadFinished")
@@ -75,9 +79,10 @@ const uploadFiles = async () => {
             searchable-placeholder="Suchen..."
             :options="availableFiletypes"
             v-model="props.fileData.type"
+            :disabled="!props.fileData.typeEnabled"
         >
           <template #label>
-            <span v-if="props.fileData.type">{{availableFiletypes.find(x => x.id === props.fileData.type).name}}</span>
+            <span v-if="availableFiletypes.find(x => x.id === props.fileData.type)">{{availableFiletypes.find(x => x.id === props.fileData.type).name}}</span>
             <span v-else>Keine Typ ausgewählt</span>
           </template>
         </USelectMenu>
diff --git a/pages/files/index.vue b/pages/files/index.vue
index 9bf8043..57393fd 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -375,7 +375,7 @@ const selectAll = () => {
       </USelectMenu>
 
 
-      <UButton @click="modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.id}})">+ Datei</UButton>
+      <UButton @click="modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.id, type: currentFolder.standardFiletype, typeEnabled: currentFolder.standardFiletypeIsOptional}})">+ Datei</UButton>
       <UButton
           @click="createFolderModalOpen = true"
           variant="outline"