diff --git a/js/about/certerror.js b/js/about/certerror.js
index 0c8b630a132..6b2fd80e7ab 100644
--- a/js/about/certerror.js
+++ b/js/about/certerror.js
@@ -52,9 +52,9 @@ class CertErrorPage extends React.Component {
       </div>
       <div className='buttons'>
         <Button l10nId='certErrorSafety' className='wideButton' onClick={this.onSafety.bind(this)} />
-        {this.state.advanced && this.state.url
-          ? <Button l10nId='certErrorButtonText' className='subtleButton' onClick={this.onAccept.bind(this)} />
-          : <Button l10nId='certErrorAdvanced' className='subtleButton' onClick={this.onAdvanced.bind(this)} />}
+        {this.state.url ? (this.state.advanced
+                  ? <Button l10nId='certErrorButtonText' className='subtleButton' onClick={this.onAccept.bind(this)} />
+                  : <Button l10nId='certErrorAdvanced' className='subtleButton' onClick={this.onAdvanced.bind(this)} />) : null}
       </div>
     </div>
   }