diff --git a/Classes/Controller/DocumentController.php b/Classes/Controller/DocumentController.php
index 48e1e015..7683514b 100755
--- a/Classes/Controller/DocumentController.php
+++ b/Classes/Controller/DocumentController.php
@@ -527,6 +527,12 @@ public function changeDocumentTypeAction(\EWW\Dpf\Domain\Model\Document $documen
             $internalFormat->setDocumentType($documentType->getName());
             $document->setXmlData($internalFormat->getXml());
 
+            /** @var DocumentMapper $documentMapper */
+            $documentMapper = $this->objectManager->get(DocumentMapper::class);
+            // Adjusting the document data according to the new document type
+            $documentForm = $documentMapper->getDocumentForm($document);
+            $document = $documentMapper->getDocument($documentForm);
+
             $this->updateDocument($document, '', null);
             $this->redirect('showDetails', 'Document', null, ['document' => $document]);
         } else {