diff --git a/modules/migrations/gitlab.go b/modules/migrations/gitlab.go
index c510944f6f4..b1027c4f64f 100644
--- a/modules/migrations/gitlab.go
+++ b/modules/migrations/gitlab.go
@@ -92,7 +92,7 @@ func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, passw
 	pathParts := strings.Split(strings.Trim(repoPath, "/"), "/")
 	var resp *gitlab.Response
 	u, _ := url.Parse(baseURL)
-	for len(pathParts) > 2 {
+	for len(pathParts) >= 2 {
 		_, resp, err = gitlabClient.Version.GetVersion()
 		if err == nil || resp != nil && resp.StatusCode == 401 {
 			err = nil // if no authentication given, this still should work
@@ -609,8 +609,12 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
 
 // GetReviews returns pull requests review
 func (g *GitlabDownloader) GetReviews(pullRequestNumber int64) ([]*base.Review, error) {
-	state, _, err := g.client.MergeRequestApprovals.GetApprovalState(g.repoID, int(pullRequestNumber), gitlab.WithContext(g.ctx))
+	state, resp, err := g.client.MergeRequestApprovals.GetApprovalState(g.repoID, int(pullRequestNumber), gitlab.WithContext(g.ctx))
 	if err != nil {
+		if resp != nil && resp.StatusCode == 404 {
+			log.Error(fmt.Sprintf("GitlabDownloader: while migrating a error occurred: '%s'", err.Error()))
+			return []*base.Review{}, nil
+		}
 		return nil, err
 	}