diff --git a/advanced/Scripts/database_migration/gravity-db.sh b/advanced/Scripts/database_migration/gravity-db.sh
index 22f241dd..f74368f4 100755
--- a/advanced/Scripts/database_migration/gravity-db.sh
+++ b/advanced/Scripts/database_migration/gravity-db.sh
@@ -122,4 +122,10 @@ upgrade_gravityDB(){
 		sqlite3 "${database}" < "${scriptPath}/13_to_14.sql"
 		version=14
 	fi
+	if [[ "$version" == "14" ]]; then
+		# Drops the vw_adlist created in 5_to_6
+		echo -e "  ${INFO} Upgrading gravity database from version 14 to 15"
+		sqlite3 "${database}" < "${scriptPath}/14_to_15.sql"
+		version=15
+	fi
 }
diff --git a/advanced/Templates/gravity.db.sql b/advanced/Templates/gravity.db.sql
index 5d7bafa9..5996be19 100644
--- a/advanced/Templates/gravity.db.sql
+++ b/advanced/Templates/gravity.db.sql
@@ -143,13 +143,6 @@ CREATE VIEW vw_gravity AS SELECT domain, adlist_by_group.group_id AS group_id
     LEFT JOIN "group" ON "group".id = adlist_by_group.group_id
     WHERE adlist.enabled = 1 AND (adlist_by_group.group_id IS NULL OR "group".enabled = 1);
 
-CREATE VIEW vw_adlist AS SELECT DISTINCT address, adlist.id AS id
-    FROM adlist
-    LEFT JOIN adlist_by_group ON adlist_by_group.adlist_id = adlist.id
-    LEFT JOIN "group" ON "group".id = adlist_by_group.group_id
-    WHERE adlist.enabled = 1 AND (adlist_by_group.group_id IS NULL OR "group".enabled = 1)
-    ORDER BY adlist.id;
-
 CREATE TRIGGER tr_domainlist_add AFTER INSERT ON domainlist
     BEGIN
       INSERT INTO domainlist_by_group (domainlist_id, group_id) VALUES (NEW.id, 0);
diff --git a/advanced/index.php b/advanced/index.php
index d0c5fc5d..2f867240 100644
--- a/advanced/index.php
+++ b/advanced/index.php
@@ -145,7 +145,7 @@ try {
 }
 
 // Get all adlist addresses
-$adlistResults = $db->query("SELECT address FROM vw_adlist");
+$adlistResults = $db->query("SELECT address FROM adlist WHERE enabled = 1");
 $adlistsUrls = array();
 while ($row = $adlistResults->fetchArray()) {
     array_push($adlistsUrls, $row[0]);