diff --git a/management/internals/modules/reverseproxy/domain/api.go b/management/internals/modules/reverseproxy/domain/api.go
index 7f61c770c..3b069bd94 100644
--- a/management/internals/modules/reverseproxy/domain/api.go
+++ b/management/internals/modules/reverseproxy/domain/api.go
@@ -61,7 +61,7 @@ func (h *handler) getAllDomains(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var ret []api.ReverseProxyDomain
+	ret := make([]api.ReverseProxyDomain, 0)
 	for _, d := range domains {
 		ret = append(ret, domainToApi(d))
 	}
diff --git a/management/internals/modules/reverseproxy/domain/manager.go b/management/internals/modules/reverseproxy/domain/manager.go
index f4259d1df..2503b6bc3 100644
--- a/management/internals/modules/reverseproxy/domain/manager.go
+++ b/management/internals/modules/reverseproxy/domain/manager.go
@@ -6,7 +6,6 @@ import (
 	"net"
 
 	"github.com/netbirdio/netbird/management/server/types"
-	"github.com/netbirdio/netbird/shared/management/status"
 )
 
 type domainType string
@@ -59,10 +58,7 @@ func (m Manager) GetDomains(ctx context.Context, accountID string) ([]*Domain, e
 		return nil, fmt.Errorf("list free domains: %w", err)
 	}
 	domains, err := m.store.ListCustomDomains(ctx, accountID)
-	if statusErr, ok := status.FromError(err); ok && statusErr.Type() == status.NotFound {
-		// This is fine, make sure domains are correctly set and continue.
-		domains = make([]*Domain, 0)
-	} else if err != nil {
+	if err != nil {
 		return nil, fmt.Errorf("list custom domains: %w", err)
 	}
 
diff --git a/management/server/store/sql_store.go b/management/server/store/sql_store.go
index 600f22f9f..86e41e931 100644
--- a/management/server/store/sql_store.go
+++ b/management/server/store/sql_store.go
@@ -4715,7 +4715,7 @@ func (s *SqlStore) ListCustomDomains(ctx context.Context, accountID string) ([]*
 	tx := s.db
 
 	var domains []*domain.Domain
-	result := tx.Find(domains, accountIDCondition, accountID)
+	result := tx.Find(&domains, accountIDCondition, accountID)
 	if result.Error != nil {
 		log.WithContext(ctx).Errorf("failed to get reverse proxy custom domains from the store: %s", result.Error)
 		return nil, status.Errorf(status.Internal, "failed to get reverse proxy custom domains from store")