diff --git a/token.module b/token.module
index 52ec0d6..9cb4f81 100644
--- a/token.module
+++ b/token.module
@@ -762,7 +762,10 @@ function token_node_menu_link_submit($entity_type, NodeInterface $node, &$form,
       $entity->menu_name->value = $values['menu_name'];
       $entity->parent->value = $values['parent'];
       $entity->weight->value = isset($values['weight']) ? $values['weight'] : 0;
-      $entity->isDefaultRevision($node->isDefaultRevision());
+      // If the entity is new, we need to make it the default (you cannot have
+      // an entity with no default revision).
+      $entity->isDefaultRevision($node->isDefaultRevision() || $entity->isNew());
+      $entity->save();
       $entity->save();
       $node->menu_link = $entity;
       // Leave this for _menu_ui_node_save() to pick up so we don't end up with