diff --git a/webapp/src/components/FirstGame.js b/webapp/src/components/FirstGame.js
index 02484a8a..0917daae 100644
--- a/webapp/src/components/FirstGame.js
+++ b/webapp/src/components/FirstGame.js
@@ -35,7 +35,7 @@ const Quiz = () => {
       setRemTime((progress) => {
         if(progress === 100){
           checkAnswer(-1);
-          setTotalTime(totalTime + progress/10)
+          setTotalTime(totalTime + (10-progress/10))
           return 0; 
         }
         const diff = 4;
diff --git a/webapp/src/components/game/Calculator.js b/webapp/src/components/game/Calculator.js
index 249a40d0..289d5bb9 100644
--- a/webapp/src/components/game/Calculator.js
+++ b/webapp/src/components/game/Calculator.js
@@ -33,7 +33,7 @@ const Calculator = () => {
         const time = setInterval(() => {
         setRemTime((progress) => {
             if(progress === 100){
-                setTotalTime(totalTime + progress/10)
+                setTotalTime(totalTime + (80-progress/10)/questions.length)
                 gameStore(id, username, points, answeredQuestions, totalTime/answeredQuestions.length);
                 init();
                 navigator('/menu')