diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc
index d83c4d334..93e15ac44 100644
--- a/src/etc/inc/config.inc
+++ b/src/etc/inc/config.inc
@@ -53,8 +53,17 @@ function alias_make_table($config)
     global $aliastable;
 
     $aliastable = array();
-
-    if (isset($config['aliases']['alias'])) {
+    $aliasMdl = new \OPNsense\Firewall\Alias();
+    // MVC defined aliases
+    foreach ($aliasMdl->aliases->alias->__items as $alias) {
+        if (strncmp((string)$alias->type, 'url', 3) !== 0) {
+            $aliastable[(string)$alias->name] = implode(" ", explode("\n", $alias->content));
+        } else {
+            $aliastable[(string)$alias->name] = "";
+        }
+    }
+    // legacy defined, keep during transition.
+    if (empty($aliastable) && isset($config['aliases']['alias'])) {
         foreach ($config['aliases']['alias'] as $alias) {
             if ($alias['name']) {
                 $aliastable[$alias['name']] = isset($alias['address']) ? $alias['address'] : null;