diff --git a/src/Form/ProfileForm.php b/src/Form/ProfileForm.php
index fe867cd..c802229 100644
--- a/src/Form/ProfileForm.php
+++ b/src/Form/ProfileForm.php
@@ -18,10 +18,12 @@ class ProfileForm extends ContentEntityForm {
     /** @var \Drupal\profile\Entity\ProfileInterface $profile */
     $profile = $this->entity;
 
-    // Display a "make default" button if:
-    // - this is an active profile and
-    // - this is not the default profile.
-    if ($profile->isActive() && !$profile->isDefault()){
+    $profile_type_storage = $this->entityTypeManager->getStorage('profile_type');
+    /** @var \Drupal\profile\Entity\ProfileTypeInterface $profile_type */
+    $profile_type = $profile_type_storage->load($profile->bundle());
+
+    // Allow the profile to be saved as default if type supports multiple.
+    if ($profile_type->getMultiple() && !$profile->isDefault()) {
       // Add a "make default" button.
       $element['set_default'] = $element['submit'];
       $element['set_default']['#value'] = $this->t('Save and make default');
diff --git a/tests/src/Functional/ProfileDefaultTest.php b/tests/src/Functional/ProfileDefaultTest.php
index 169e471..03076cc 100644
--- a/tests/src/Functional/ProfileDefaultTest.php
+++ b/tests/src/Functional/ProfileDefaultTest.php
@@ -96,8 +96,10 @@ class ProfileDefaultTest extends ProfileTestBase {
 
     $this->drupalGet($profile1->toUrl('edit-form')->toString());
     $this->assertSession()->buttonNotExists('Save and make default');
+    $this->assertSession()->buttonExists('Save');
 
     $this->drupalGet($profile2->toUrl('edit-form')->toString());
+    $this->assertSession()->buttonExists('Save');
     $this->assertSession()->buttonExists('Save and make default');
     $this->submitForm([], 'Save and make default');
 
diff --git a/tests/src/Functional/ProfileFieldAccessTest.php b/tests/src/Functional/ProfileFieldAccessTest.php
index ca9053f..eebf776 100644
--- a/tests/src/Functional/ProfileFieldAccessTest.php
+++ b/tests/src/Functional/ProfileFieldAccessTest.php
@@ -88,6 +88,7 @@ class ProfileFieldAccessTest extends ProfileTestBase {
       'profile_fullname[0][value]' => $secret,
       'profile_bio[0][value]' => $not_secret,
     ];
+    $this->assertSession()->buttonNotExists('Save and make default');
     $this->submitForm($edit, 'Save');
 
     /** @var \Drupal\profile\ProfileStorageInterface $storage */
diff --git a/tests/src/Functional/ProfileTest.php b/tests/src/Functional/ProfileTest.php
index 9114b43..e858009 100644
--- a/tests/src/Functional/ProfileTest.php
+++ b/tests/src/Functional/ProfileTest.php
@@ -25,6 +25,7 @@ class ProfileTest extends ProfileTestBase {
     ]);
     $this->drupalGet($create_url->toString());
     $this->assertSession()->titleEquals("Create {$this->type->label()} | Drupal");
+    $this->assertSession()->buttonNotExists('Save and make default');
     $edit = [
       'profile_fullname[0][value]' => $profile_fullname,
     ];