diff --git a/src/App.js b/src/App.js
index b069528..7028e11 100644
--- a/src/App.js
+++ b/src/App.js
@@ -195,11 +195,13 @@ function Contract() {
           <button className="button is-warning" style={{marginBottom: '1em', marginLeft: '1em'}} disabled>Tokens not entered yet. Go degen.</button>
         )}
 
-        <div className="buttons">
-        {JSON.parse(options.claimableTokens).map((tokenId, idx) => (
-          <button key={idx} className="button is-success" style={{marginBottom: '1em', marginRight: '1em'}}>{tokenId}</button>
-        ))}
-        </div>
+        {options.claimableTokens !== '' && (
+          <div className="buttons">
+            {JSON.parse(options.claimableTokens).map((tokenId, idx) => (
+              <button key={idx} className="button is-success" style={{marginBottom: '1em', marginRight: '1em'}}>{tokenId}</button>
+            ))}
+          </div>
+        )}
 
         {options.totalSupply < options.max && (
         <div className="block">
@@ -233,7 +235,7 @@ function Contract() {
         </div>
         {options.tokensSet && (
           <div className="notification is-warning" style={{marginTop: '2em'}}>
-            Tokens have now been specified in the contract. Owners of those tokens can claim the Ether. Congrats to the winners!
+            Tokens have now been specified in the contract. Owners of those tokens can claim the Ether by clicking the claim buttons above. Congrats to the winners!
           </div>
         )}
         <div className="notification is-info" style={{marginTop: '2em'}}>