diff --git a/server/remote/gitlab/convert.go b/server/remote/gitlab/convert.go
index 716e72fe0..d1f566a22 100644
--- a/server/remote/gitlab/convert.go
+++ b/server/remote/gitlab/convert.go
@@ -28,9 +28,9 @@ import (
 
 func (g *Gitlab) convertGitlabRepo(_repo *gitlab.Project) (*model.Repo, error) {
 	parts := strings.Split(_repo.PathWithNamespace, "/")
-	// TODO: save repo id (support nested repos)
-	var owner = parts[0]
-	var name = parts[1]
+	// TODO(648) save repo id (support nested repos)
+	var owner = strings.Join(parts[:len(parts)-1], "/")
+	var name = parts[len(parts)-1]
 	repo := &model.Repo{
 		Owner:      owner,
 		Name:       name,