diff --git a/src/Entity/FillPdfForm.php b/src/Entity/FillPdfForm.php
index 7b5acf4c0f93f06c7e234f6442961c3be25a422a..7215aefec7314d03d83304745ed82fd040551aae 100644
--- a/src/Entity/FillPdfForm.php
+++ b/src/Entity/FillPdfForm.php
@@ -222,6 +222,14 @@ class FillPdfForm extends ContentEntityBase implements FillPdfFormInterface {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultEntityType(): ?string {
+    $default_entity_type = $this->get('default_entity_type');
+    return count($default_entity_type) ? $default_entity_type->first()->value : NULL;
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/src/FillPdfFormInterface.php b/src/FillPdfFormInterface.php
index 42f4382f659ec0bd94c93b44114dffcdd51f92e7..7e4cfea0e2689064c504ee6d40d320a0dace6a64 100644
--- a/src/FillPdfFormInterface.php
+++ b/src/FillPdfFormInterface.php
@@ -9,6 +9,14 @@ namespace Drupal\fillpdf;
  */
 interface FillPdfFormInterface extends ExportableContentEntityInterface {
 
+  /**
+   * Returns the default entity type ID for this FillPdfForm.
+   *
+   * @return string|null
+   *   The entity type ID or NULL if there is none set.
+   */
+  public function getDefaultEntityType(): ?string;
+
   /**
    * Returns all FillPdfFormFields associated with this FillPdfForm.
    *
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index 84c467a0ea44edf0a7e548b0f380869738f4d44c..aaab5e5abe4f7ae9d32c83ff59c95682307b6aa4 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -147,9 +147,7 @@ class FillPdfFormForm extends ContentEntityForm {
 
     $form['title']['token_tree'] = $this->adminFormHelper->getAdminTokenForm();
 
-    // @todo Encapsulate this logic into a ::getDefaultEntityType() method on FillPdfForm
-    $stored_default_entity_type = $fillpdf_form->get('default_entity_type');
-    $default_entity_type = count($stored_default_entity_type) ? $stored_default_entity_type->first()->value : NULL;
+    $default_entity_type = $fillpdf_form->getDefaultEntityType();
 
     $form['default_entity_type'] = [
       '#type' => 'select',