diff --git a/lib/Drupal/Core/Entity/EntityForm.php b/lib/Drupal/Core/Entity/EntityForm.php
index 25b837b581..a55aa058db 100644
--- a/lib/Drupal/Core/Entity/EntityForm.php
+++ b/lib/Drupal/Core/Entity/EntityForm.php
@@ -365,6 +365,9 @@ class EntityForm extends FormBase implements EntityFormInterface {
         elseif ($route_match->getRawParameter($bundle_key)) {
           $values[$bundle_key] = $route_match->getParameter($bundle_key);
         }
+        elseif ($route_match->getParameter($bundle_key)) {
+          $values[$bundle_key] = $route_match->getParameter($bundle_key);
+        }
       }
 
       $entity = $this->entityTypeManager->getStorage($entity_type_id)->create($values);