diff --git a/server/trivabble-server.js b/server/trivabble-server.js
index a07fafe..8a68a87 100644
--- a/server/trivabble-server.js
+++ b/server/trivabble-server.js
@@ -556,7 +556,7 @@ function handleCommand(cmdNumber, message, response) {
                 case "rack":
                     rack = game.getPlayerRack(playerName);
 
-                    if (cmd.indexFrom > 6 || cmd.indexFrom < 0) {
+                    if (cmd.indexFrom > rackLength - 1 || cmd.indexFrom < 0) {
                         reply(message, response, cmdNumber, {error: 1, reason: "Wrong indexFrom"});
                         return false;
                     }
@@ -601,7 +601,7 @@ function handleCommand(cmdNumber, message, response) {
 
             switch (cmd.to) {
                 case "rack":
-                    if (cmd.indexTo < 0 || cmd.indexTo > 6) {
+                    if (cmd.indexTo < 0 || cmd.indexTo > rackLength - 1) {
                         reply(message, response, cmdNumber, {error: 1, reason: "Wrong indexTo"});
                         return false;
                     }