diff --git a/modules/gitlab/gitlab_project.go b/modules/gitlab/gitlab_project.go
index 0aea009d..332f77ea 100644
--- a/modules/gitlab/gitlab_project.go
+++ b/modules/gitlab/gitlab_project.go
@@ -11,14 +11,7 @@ type context struct {
 
 func newContext(settings *Settings) (*context, error) {
 	baseURL := settings.domain
-	gitlabClient := glb.NewClient(nil, settings.apiKey)
-
-	if baseURL != "" {
-		err := gitlabClient.SetBaseURL(baseURL)
-		if err != nil {
-			return nil, err
-		}
-	}
+	gitlabClient, _ := glb.NewClient(settings.apiKey, glb.WithBaseURL(baseURL))
 
 	user, _, err := gitlabClient.Users.CurrentUser()
 
diff --git a/modules/gitlabtodo/widget.go b/modules/gitlabtodo/widget.go
index 5e412185..e6f1c16e 100644
--- a/modules/gitlabtodo/widget.go
+++ b/modules/gitlabtodo/widget.go
@@ -27,7 +27,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 		settings: settings,
 	}
 
-	widget.gitlabClient = gitlab.NewClient(nil, settings.apiKey)
+	widget.gitlabClient, _ = gitlab.NewClient(settings.apiKey)
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()