diff --git a/common/app/routes/challenges/utils.js b/common/app/routes/challenges/utils.js
index 12fab290e6..22e9f5c962 100644
--- a/common/app/routes/challenges/utils.js
+++ b/common/app/routes/challenges/utils.js
@@ -121,7 +121,7 @@ export function getFirstChallengeOfNextBlock(current, entites) {
   }
   const superBlock = SuperBlockMap[block.superBlock];
   const index = superBlock.blocks.indexOf(block.dashedName);
-  const newBlock = superBlock.blocks[ index + 1 ];
+  const newBlock = blockMap[superBlock.blocks[ index + 1 ]];
   if (!newBlock) {
     return null;
   }