diff --git a/CHANGELOG.md b/CHANGELOG.md
index b92eb19a..3755ae41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
+- Clearing the DNS cache on the *DNS settings* page now includes both global cache and custom client cache.
+
 - Invalid ICMPv6 Router Advertisement messages ([#7547]).
 
 - Disabled button for autofilled login form.
diff --git a/internal/client/upstreammanager.go b/internal/client/upstreammanager.go
index f6cad878..b804dbdc 100644
--- a/internal/client/upstreammanager.go
+++ b/internal/client/upstreammanager.go
@@ -153,7 +153,9 @@ func (m *upstreamManager) isConfigChanged(cliConf *customUpstreamConfig) (ok boo
 // upstream configuration.
 func (m *upstreamManager) clearUpstreamCache() {
 	for _, c := range m.uidToCustomConf {
-		c.proxyConf.ClearCache()
+		if c.proxyConf != nil {
+			c.proxyConf.ClearCache()
+		}
 	}
 }