diff --git a/config_dev.go b/config_dev.go
index 3a34903c..45a9e38b 100644
--- a/config_dev.go
+++ b/config_dev.go
@@ -108,11 +108,11 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
 
 		acctStore := accounts.NewSQLStore(sqlStore.BaseDB, clock)
 		sessStore := session.NewSQLStore(sqlStore.BaseDB, clock)
-		rulesStore := firewalldb.NewSQLDB(sqlStore.BaseDB)
+		firewallStore := firewalldb.NewSQLDB(sqlStore.BaseDB)
 
 		stores.accounts = acctStore
 		stores.sessions = sessStore
-		stores.rules = rulesStore
+		stores.firewall = firewalldb.NewDB(firewallStore)
 		stores.closeFns["sqlite"] = sqlStore.BaseDB.Close
 
 	case DatabaseBackendPostgres:
@@ -127,7 +127,7 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
 
 		stores.accounts = acctStore
 		stores.sessions = sessStore
-		stores.rules = rulesStore
+		stores.firewall = firewalldb.NewDB(rulesStore)
 		stores.closeFns["postgres"] = sqlStore.BaseDB.Close
 
 	default:
@@ -165,9 +165,5 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
 	stores.firewallBolt = firewallBoltDB
 	stores.closeFns["bbolt-firewalldb"] = firewallBoltDB.Close
 
-	if stores.rules == nil {
-		stores.rules = firewallBoltDB
-	}
-
 	return stores, nil
 }
diff --git a/config_prod.go b/config_prod.go
index b777408e..d10f0adb 100644
--- a/config_prod.go
+++ b/config_prod.go
@@ -61,7 +61,6 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
 	if err != nil {
 		return stores, fmt.Errorf("error creating firewall DB: %v", err)
 	}
-	stores.rules = firewallDB
 	stores.firewallBolt = firewallDB
 	stores.firewall = firewalldb.NewDB(firewallDB)
 	stores.closeFns["firewall"] = firewallDB.Close
diff --git a/terminal.go b/terminal.go
index 500a6c14..c48c5fcf 100644
--- a/terminal.go
+++ b/terminal.go
@@ -238,7 +238,6 @@ func New() *LightningTerminal {
 type stores struct {
 	accounts accounts.Store
 	sessions session.Store
-	rules    firewalldb.RulesDB
 
 	firewall     *firewalldb.DB
 	firewallBolt *firewalldb.BoltDB
@@ -1113,7 +1112,7 @@ func (g *LightningTerminal) startInternalSubServers(ctx context.Context,
 
 	if !g.cfg.Autopilot.Disable {
 		ruleEnforcer := firewall.NewRuleEnforcer(
-			g.stores.rules, g.stores.firewallBolt,
+			g.stores.firewall, g.stores.firewallBolt,
 			g.stores.sessions,
 			g.autopilotClient.ListFeaturePerms,
 			g.permsMgr, g.lndClient.NodePubkey,