diff --git a/source/git-api.js b/source/git-api.js
index 8efd9a354..8c48eb71d 100644
--- a/source/git-api.js
+++ b/source/git-api.js
@@ -547,8 +547,10 @@ exports.registerApi = (env) => {
   );
 
   app.get(`${exports.pathPrefix}/tags`, ensureAuthenticated, ensurePathExists, (req, res) => {
-    const task = gitPromise(['tag', '-l'], req.query.path).then(gitParser.parseGitTags);
-    jsonResultOrFailProm(res, task);
+    let pathToRepo = req.query.path;
+    nodegit.Repository.open(pathToRepo).then(function (repo) {
+      jsonResultOrFailProm(res, nodegit.Tag.list(repo));
+    });
   });
 
   app.get(