diff --git a/internal/dnsforward/dnsforward.go b/internal/dnsforward/dnsforward.go
index 05d2eab9..3640101c 100644
--- a/internal/dnsforward/dnsforward.go
+++ b/internal/dnsforward/dnsforward.go
@@ -184,9 +184,6 @@ func (s *Server) Prepare(config *ServerConfig) error {
 				return fmt.Errorf("dns: invalid custom blocking IP address specified")
 			}
 		}
-		if s.conf.MaxGoroutines == 0 {
-			s.conf.MaxGoroutines = 50
-		}
 	}
 
 	// Set default values in the case if nothing is configured
diff --git a/internal/home/config.go b/internal/home/config.go
index 4728c2e3..2f1e7da7 100644
--- a/internal/home/config.go
+++ b/internal/home/config.go
@@ -120,6 +120,12 @@ var config = configuration{
 			Ratelimit:          20,
 			RefuseAny:          true,
 			AllServers:         false,
+
+			// set default maximum concurrent queries to 300
+			// we introduced a default limit due to this:
+			// https://github.com/AdguardTeam/AdGuardHome/issues/2015#issuecomment-674041912
+			// was later increased to 300 due to https://github.com/AdguardTeam/AdGuardHome/issues/2257
+			MaxGoroutines: 300,
 		},
 		FilteringEnabled:           true, // whether or not use filter lists
 		FiltersUpdateIntervalHours: 24,