diff --git a/waku/v2/protocol/filter/common.go b/waku/v2/protocol/filter/common.go
index bbccde56..9bbd7be7 100644
--- a/waku/v2/protocol/filter/common.go
+++ b/waku/v2/protocol/filter/common.go
@@ -5,10 +5,11 @@ import (
 	"time"
 )
 
-const DefaultMaxSubscriptions = 1000
+const DefaultMaxSubscribers = 20
 const MaxCriteriaPerSubscription = 1000
-const MaxContentTopicsPerRequest = 30
+const MaxContentTopicsPerRequest = 100
 const MessagePushTimeout = 20 * time.Second
+const DefaultIdleSubscriptionTimeout = 5 * time.Minute
 
 type FilterError struct {
 	Code    int
diff --git a/waku/v2/protocol/filter/options.go b/waku/v2/protocol/filter/options.go
index 8743218b..f1987621 100644
--- a/waku/v2/protocol/filter/options.go
+++ b/waku/v2/protocol/filter/options.go
@@ -204,7 +204,7 @@ func WithPeerManager(pm *peermanager.PeerManager) Option {
 
 func DefaultOptions() []Option {
 	return []Option{
-		WithTimeout(5 * time.Minute),
-		WithMaxSubscribers(DefaultMaxSubscriptions),
+		WithTimeout(DefaultIdleSubscriptionTimeout),
+		WithMaxSubscribers(DefaultMaxSubscribers),
 	}
 }