diff --git a/firewall/api.go b/firewall/api.go
index bc45fb30..eee01be7 100644
--- a/firewall/api.go
+++ b/firewall/api.go
@@ -35,7 +35,7 @@ func prepAPIAuth() error {
 
 func startAPIAuth() {
 	var err error
-	apiIP, apiPort, err = parseHostPort(api.GetAPIAddress())
+	apiIP, apiPort, err = parseHostPort(apiListenAddress())
 	if err != nil {
 		log.Warningf("firewall: failed to parse API address for improved api auth mechanism: %s", err)
 	}
diff --git a/firewall/config.go b/firewall/config.go
index cc6e4afd..7ce3f0a2 100644
--- a/firewall/config.go
+++ b/firewall/config.go
@@ -10,6 +10,7 @@ var (
 	filterDNSByScope   status.SecurityLevelOption
 	filterDNSByProfile status.SecurityLevelOption
 	devMode            config.BoolOption
+	apiListenAddress   config.StringOption
 )
 
 func registerConfig() error {
@@ -56,7 +57,8 @@ func registerConfig() error {
 	}
 	filterDNSByProfile = status.ConfigIsActiveConcurrent("firewall/filterDNSByProfile")
 
-	devMode = config.Concurrent.GetAsBool("firewall/permanentVerdicts", true)
+	devMode = config.Concurrent.GetAsBool("firewall/permanentVerdicts", false)
+	apiListenAddress = config.GetAsString("api/listenAddress", "")
 
 	return nil
 }
diff --git a/ui/module.go b/ui/module.go
index 3927c4ed..cf98aba1 100644
--- a/ui/module.go
+++ b/ui/module.go
@@ -1,13 +1,11 @@
 package ui
 
 import (
-	"github.com/safing/portbase/api"
 	"github.com/safing/portbase/modules"
 )
 
 func init() {
 	modules.Register("ui", prep, nil, nil, "updates", "api")
-	api.SetDefaultAPIListenAddress("127.0.0.1:817")
 }
 
 func prep() error {