diff --git a/system/addon/api.go b/system/addon/api.go
index cd792aa2..ae4909b2 100644
--- a/system/addon/api.go
+++ b/system/addon/api.go
@@ -18,10 +18,10 @@ type QueryOptions db.QueryOptions
 
 // ContentAll retrives all items from the HTTP API within the provided namespace
 func ContentAll(namespace string) []byte {
-	host := db.ConfigCache("domain").(string)
+	addr := db.ConfigCache("bind_addr").(string)
 	port := db.ConfigCache("http_port").(string)
 	endpoint := "http://%s:%s/api/contents?type=%s&count=-1"
-	URL := fmt.Sprintf(endpoint, host, port, namespace)
+	URL := fmt.Sprintf(endpoint, addr, port, namespace)
 
 	j, err := Get(URL)
 	if err != nil {
@@ -35,10 +35,10 @@ func ContentAll(namespace string) []byte {
 // Query retrieves a set of content from the HTTP API  based on options
 // and returns the total number of content in the namespace and the content
 func Query(namespace string, opts QueryOptions) []byte {
-	host := db.ConfigCache("domain").(string)
+	addr := db.ConfigCache("bind_addr").(string)
 	port := db.ConfigCache("http_port").(string)
 	endpoint := "http://%s:%s/api/contents?type=%s&count=%d&offset=%d&order=%s"
-	URL := fmt.Sprintf(endpoint, host, port, namespace, opts.Count, opts.Offset, opts.Order)
+	URL := fmt.Sprintf(endpoint, addr, port, namespace, opts.Count, opts.Offset, opts.Order)
 
 	j, err := Get(URL)
 	if err != nil {