diff --git a/scripts/installer/as-setup.sh b/scripts/installer/as-setup.sh
index eb8c72973c8..e87122ba77c 100755
--- a/scripts/installer/as-setup.sh
+++ b/scripts/installer/as-setup.sh
@@ -111,6 +111,7 @@ function preliminary_setup()
   ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.fake.label=Fake DOI Provider"
   ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.fake.authority=10.5072"
   ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.fake.shoulder=FK2/"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.default-provider=fake"
   # jvm-options use colons as separators, escape as literal
   #DOI_DATACITERESTAPIURL_ESC=`echo $DOI_DATACITERESTAPIURL | sed -e 's/:/\\\:/'`
   #./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.testDC.datacite.rest-api-url=$DOI_DATACITERESTAPIURL_ESC"
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/ConfigCheckService.java b/src/main/java/edu/harvard/iq/dataverse/settings/ConfigCheckService.java
index 29a9d8956a3..96222f40daf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/settings/ConfigCheckService.java
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/ConfigCheckService.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse.settings;
 
 import edu.harvard.iq.dataverse.MailServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
 import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
 import edu.harvard.iq.dataverse.util.FileUtil;
@@ -32,6 +33,8 @@ public class ConfigCheckService {
     MailSessionProducer mailSessionProducer;
     @Inject
     MailServiceBean mailService;
+    @Inject
+    PidProviderFactoryBean pidProviderFactoryBean;
 
     public static class ConfigurationError extends RuntimeException {
         public ConfigurationError(String message) {
@@ -132,6 +135,16 @@ public void checkSystemMailSetup() {
      * @return True if all checks successful, false otherwise.
      */
     private boolean checkPidProviders() {
-        return PidUtil.getManagedProviderIds().size() > 0;
+        // Check if at least one PidProvider capable of editing/minting PIDs is configured.
+        boolean valid=true;
+        if(!(PidUtil.getManagedProviderIds().size() > 0)) {
+            valid = false;
+            logger.warning("No PID providers configured");
+        }
+        if (pidProviderFactoryBean.getDefaultPidGenerator()==null){
+            valid=false;
+            logger.warning("No default PID provider configured");
+        }
+        return valid;
     }
 }