diff --git a/Webservice/server.js b/Webservice/server.js
index 1fb40ac..cc4ec85 100644
--- a/Webservice/server.js
+++ b/Webservice/server.js
@@ -124,6 +124,8 @@ io.on('connection', socket => {
 
     socket.on('card finished', function (difficulty) {
         gameState['positions'][gameState['players'].indexOf(socket.username)] += difficulty;
+        gameState['whosNext'] += 1;
+        if(gameState['whosNext'] === gameState['players'].length) gameState['whosNext'] = 0;
         io.in(socket.room).emit('card destroyed');
     });
 });
diff --git a/public/js/game.js b/public/js/game.js
index bfeb773..43b320f 100644
--- a/public/js/game.js
+++ b/public/js/game.js
@@ -169,6 +169,8 @@ function start_game() {
     });
 
     socket.on('card destroyed', function () {
+        diced = false;
+        show_card = false;
         card.destroyCard();
         rolled_number_text.destroy();
         border_card_stack.clear();