diff --git a/packages/page-council/src/Overview/Voters.tsx b/packages/page-council/src/Overview/Voters.tsx
index e74a02aead..cbb0186672 100644
--- a/packages/page-council/src/Overview/Voters.tsx
+++ b/packages/page-council/src/Overview/Voters.tsx
@@ -28,19 +28,26 @@ function Voters ({ balance, voters }: Props): React.ReactElement<Props> {
 
   return (
     <>
-      <td className='expand'>
-        <ExpanderScroll
-          className={balance ? '' : '--tmp'}
-          renderChildren={renderVoters}
-          summary={<FormatBalance value={balance} />}
-        />
-      </td>
-      <td className='number'>
-        {voters
-          ? formatNumber(voters.length)
-          : <span className='--tmp'>123</span>
-        }
-      </td>
+      {voters
+        ? (
+          <>
+            <td className='expand'>
+              <ExpanderScroll
+                className={balance ? '' : '--tmp'}
+                renderChildren={renderVoters}
+                summary={<FormatBalance value={balance} />}
+              />
+            </td>
+            <td className='number'>
+              {voters
+                ? formatNumber(voters.length)
+                : <span className='--tmp'>123</span>
+              }
+            </td>
+          </>
+        )
+        : <td colSpan={2} />
+      }
     </>
   );
 }
diff --git a/packages/page-democracy/src/Overview/ProposalCell.tsx b/packages/page-democracy/src/Overview/ProposalCell.tsx
index c2a3cbeb55..9e70644730 100644
--- a/packages/page-democracy/src/Overview/ProposalCell.tsx
+++ b/packages/page-democracy/src/Overview/ProposalCell.tsx
@@ -31,7 +31,7 @@ function ProposalCell ({ className = '', imageHash, proposal }: Props): React.Re
   const preimage = usePreimage(imageHash);
 
   // while we still have this endpoint, democracy will use it
-  const displayProposal = api.query.democracy.preimages
+  const displayProposal = api.query.democracy?.preimages
     ? proposal
     : preimage?.proposal;