diff --git a/client.go b/client.go
index 2400737..40a698f 100644
--- a/client.go
+++ b/client.go
@@ -46,6 +46,6 @@ func NewAuthorizerClient(clientID, authorizerURL, redirectURL string, extraHeade
 		RedirectURL:   strings.TrimSuffix(redirectURL, "/"),
 		AuthorizerURL: strings.TrimSuffix(authorizerURL, "/"),
 		ClientID:      clientID,
-		ExtraHeaders:  extraHeaders,
+		ExtraHeaders:  headers,
 	}, nil
 }
diff --git a/graphql.go b/graphql.go
index 4a37923..02134e5 100644
--- a/graphql.go
+++ b/graphql.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"io"
 	"net/http"
+	"time"
 )
 
 // GraphQLRequest is object used to make graphql queries
@@ -30,7 +31,7 @@ func (c *AuthorizerClient) ExecuteGraphQL(req *GraphQLRequest, headers map[strin
 		return nil, err
 	}
 
-	client := http.Client{}
+	client := http.Client{Timeout: 30 * time.Second}
 	httpReq, err := http.NewRequest(http.MethodPost, c.AuthorizerURL+"/graphql", bytes.NewReader(jsonReq))
 	if err != nil {
 		return nil, err