diff --git a/common/app/Map/Block.jsx b/common/app/Map/Block.jsx
index 90b6941ee4..1e7b6f7a98 100644
--- a/common/app/Map/Block.jsx
+++ b/common/app/Map/Block.jsx
@@ -97,7 +97,7 @@ export class Block extends PureComponent {
         key={ title }
         onSelect={ this.handleSelect }
         >
-        { this.renderChallenges(challenges) }
+        { isOpen && this.renderChallenges(challenges) }
       </Panel>
     );
   }
diff --git a/common/app/Map/Super-Block.jsx b/common/app/Map/Super-Block.jsx
index f699a7fcd8..bce4bca68f 100644
--- a/common/app/Map/Super-Block.jsx
+++ b/common/app/Map/Super-Block.jsx
@@ -109,7 +109,7 @@ export class SuperBlock extends PureComponent {
         >
         { this.renderMessage(message) }
         <div className={ `${ns}-accordion-block` }>
-          { this.renderBlocks(blocks) }
+          { isOpen && this.renderBlocks(blocks) }
         </div>
       </Panel>
     );