diff --git a/routes/routes-project.js b/routes/routes-project.js
index 042a8442fd83a28a9e3963cc73b038ad974ae975..ad04a1dafa0905b16dc37de85147a92f0b879388 100644
--- a/routes/routes-project.js
+++ b/routes/routes-project.js
@@ -362,30 +362,40 @@ module.exports = function (app) {
 
   app.get('/projectlist', async function(req, res){
     let projectArr = []
-    let marker = false
+    let isProject = true
     let firstId = 0
-/*
-    while (marker == false) {
+
+    while (isProject == true) {
       let projects = await getProjectsFromGitlab(10, firstId)
       let projectData = projects.data
 
-      for(let i = 0; i < projectData.length; i++){
-        console.log(projectData[i].name)
-        if (projectData[i].avatar_url == null) {
-          projectData[i].avatar_url = "https://m4lab.hft-stuttgart.de/img/footer/M4_LAB_LOGO_Graustufen.png"
-        }
-        let project = {
-          logo: projectData[i].avatar_url,
-          name: projectData[i].name,
-          weburl: projectData[i].web_url,
-          desc: projectData[i].description
-        }
-        projectArr.push(project)
+      if (projectData.length == 0) {
+        isProject = false
       }
+      else {
+        for(let i = 0; i < projectData.length; i++){
+          console.log(projectData[i].id)
+          if (projectData[i].avatar_url == null) {
+            projectData[i].avatar_url = "https://m4lab.hft-stuttgart.de/img/footer/M4_LAB_LOGO_Graustufen.png"
+          }
+          let project = {
+            logo: projectData[i].avatar_url,
+            name: projectData[i].name,
+            weburl: projectData[i].web_url,
+            desc: projectData[i].description
+          }
+          projectArr.push(project)
+        }
 
-      marker = true
+        firstId = projectData[projectData.length-1].id
+        console.log('firstId: '+firstId)
+      }
+      
     }
-*/
+    res.render(lang+'/project/projectList', {
+      project: projectArr
+    })
+/*
     let projects = await getProjectsFromGitlab(10, 0)
     let projectData = projects.data
 
@@ -406,7 +416,7 @@ module.exports = function (app) {
     res.render(lang+'/project/projectList', {
       project: projectArr
     })
-    
+    */
 /*
       request.get('https://transfer.hft-stuttgart.de/gitlab/api/v4/projects?pagination=keyset&per_page=100&order_by=id&sort=asc&id_after='+firstId, function(error, response, body){
         if(!error) {