diff --git a/functions/saba_disambiguator/main.go b/functions/saba_disambiguator/main.go
index e56529a..95644df 100644
--- a/functions/saba_disambiguator/main.go
+++ b/functions/saba_disambiguator/main.go
@@ -64,7 +64,10 @@ func DoDisambiguate() error {
 		Region: aws.String(config.Region),
 	})
 
-	client := twitter2.NewClient(config.TwitterConfig.ParameterStoreNameBearerToken)
+	client, err := sabadisambiguator.GetTwitterClient(svc, *config)
+	if err != nil {
+		return err
+	}
 
 	slackConfig, err := getSlackConfig(svc, *config)
 	if err != nil {
@@ -75,7 +78,7 @@ func DoDisambiguate() error {
 	if err != nil {
 		return err
 	}
-	query := "mackerel lang:ja exclude:retweets"
+	query := "mackerel lang:ja -is:retweet"
 	if config.Query != "" {
 		query = config.Query
 	}