diff --git a/spec/SecurityCheckGroups.spec.js b/spec/SecurityCheckGroups.spec.js
index 43d523c214..b90b1f6960 100644
--- a/spec/SecurityCheckGroups.spec.js
+++ b/spec/SecurityCheckGroups.spec.js
@@ -62,7 +62,7 @@ describe('Security Check Groups', () => {
       expect(group.checks().length).toBeGreaterThan(0);
     });
 
-    it('checks succeed correctly', async () => {
+    it('checks succeed correctly with database adapter defined', async () => {
       const config = Config.get(Parse.applicationId);
       config.database.adapter._uri = 'protocol://user:aMoreSecur3Passwor7!@example.com';
       const group = new CheckGroupDatabase();
@@ -70,12 +70,28 @@ describe('Security Check Groups', () => {
       expect(group.checks()[0].checkState()).toBe(CheckState.success);
     });
 
-    it('checks fail correctly', async () => {
+    it('checks succeed correctly with databaseURI defined', async () => {
+      const config = Config.get(Parse.applicationId);
+      config.databaseURI = 'protocol://user:insecure@example.com';
+      const group = new CheckGroupDatabase();
+      await group.run();
+      expect(group.checks()[0].checkState()).toBe(CheckState.success);
+    });
+
+    it('checks fail correctly with database adapter defined', async () => {
       const config = Config.get(Parse.applicationId);
       config.database.adapter._uri = 'protocol://user:insecure@example.com';
       const group = new CheckGroupDatabase();
       await group.run();
       expect(group.checks()[0].checkState()).toBe(CheckState.fail);
     });
+
+    it('checks fail correctly with databaseURI defined', async () => {
+      const config = Config.get(Parse.applicationId);
+      config.databaseURI = 'protocol://user:insecure@example.com';
+      const group = new CheckGroupDatabase();
+      await group.run();
+      expect(group.checks()[0].checkState()).toBe(CheckState.fail);
+    });
   });
 });
diff --git a/src/Security/CheckGroups/CheckGroupDatabase.js b/src/Security/CheckGroups/CheckGroupDatabase.js
index bc57fef8a3..37ecf9eedd 100644
--- a/src/Security/CheckGroups/CheckGroupDatabase.js
+++ b/src/Security/CheckGroups/CheckGroupDatabase.js
@@ -14,8 +14,15 @@ class CheckGroupDatabase extends CheckGroup {
   }
   setChecks() {
     const config = Config.get(Parse.applicationId);
+    let databaseUrl;
     const databaseAdapter = config.database.adapter;
-    const databaseUrl = databaseAdapter._uri;
+    if (databaseAdapter) {
+      // If database adapter is defined, use its URI
+      databaseUrl = databaseAdapter._uri;
+    } else if (config.databaseURI) {
+      // If database adapter is not defined, fallback to config.databaseURI
+      databaseUrl = config.databaseURI;
+    } 
     return [
       new Check({
         title: 'Secure database password',