diff --git a/server/routes/games.js b/server/routes/games.js
index 6596f4f..7ffaa01 100755
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -1597,9 +1597,13 @@ const getValidCorners = (game, color, type) => {
       }
     }
     if (valid) {
-      if (game.state !== 'initial-placement' 
-        || (isRuleEnabled(game, 'volcano')
-          && layout.tiles[game.robber].corners.indexOf(cornerIndex) === -1)) {
+      /* During initial placement, if volcano is enabled, do not allow
+       * placement on a corner connected to the volcano (robber starts
+       * on the volcano) */
+      if (!(game.state === 'initial-placement' 
+        && isRuleEnabled(game, 'volcano')
+        && layout.tiles[game.robber].corners.indexOf(cornerIndex) !== -1
+      )) {
         limits.push(cornerIndex);
       }
     }