diff --git a/internal/thoth/asnchecker_test.go b/internal/thoth/asnchecker_test.go
index ba22489b..61857a63 100644
--- a/internal/thoth/asnchecker_test.go
+++ b/internal/thoth/asnchecker_test.go
@@ -5,16 +5,19 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/TecharoHQ/anubis/lib/policy"
 	iptoasnv1 "github.com/TecharoHQ/thoth-proto/gen/techaro/thoth/iptoasn/v1"
 )
 
+var _ policy.Checker = &ASNChecker{}
+
 func TestASNChecker(t *testing.T) {
 	cli := loadSecrets(t)
 
 	asnc := &ASNChecker{
 		iptoasn: cli.iptoasn,
 		asns: map[int]struct{}{
-			13335: struct{}{},
+			13335: {},
 		},
 		hash: "foobar",
 	}
diff --git a/internal/thoth/thoth.go b/internal/thoth/thoth.go
index eb0f36e3..c373e69d 100644
--- a/internal/thoth/thoth.go
+++ b/internal/thoth/thoth.go
@@ -4,9 +4,11 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"time"
 
 	iptoasnv1 "github.com/TecharoHQ/thoth-proto/gen/techaro/thoth/iptoasn/v1"
 	grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
+	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/timeout"
 	"github.com/prometheus/client_golang/prometheus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -34,6 +36,7 @@ func New(ctx context.Context, thothURL, apiToken string) (*Client, error) {
 		thothURL,
 		grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{})),
 		grpc.WithChainUnaryInterceptor(
+			timeout.UnaryClientInterceptor(500*time.Millisecond),
 			clMetrics.UnaryClientInterceptor(),
 			authUnaryClientInterceptor(apiToken),
 		),