diff --git a/src/components/modals/marketplace/Items.jsx b/src/components/modals/marketplace/Items.jsx
index e030c545..30ff2db6 100644
--- a/src/components/modals/marketplace/Items.jsx
+++ b/src/components/modals/marketplace/Items.jsx
@@ -11,7 +11,7 @@ export default class Items extends React.PureComponent {
             <h1>{this.props.title}</h1>
             <div className='items'>
                 {this.props.items.map((item) =>
-                    <div className='item' onClick={() => this.props.toggleFunction(item.name)}>
+                    <div className='item' onClick={() => this.props.toggleFunction(item.name)} key={item.name}>
                         <img alt='icon' draggable={false} src={'https://external-content.duckduckgo.com/iu/?u=' + item.icon_url} />
                         <div className='details'>
                             <h4>{item.display_name}</h4>
diff --git a/src/components/widgets/Quote.jsx b/src/components/widgets/Quote.jsx
index 765d7115..62d02e3a 100644
--- a/src/components/widgets/Quote.jsx
+++ b/src/components/widgets/Quote.jsx
@@ -92,6 +92,7 @@ export default class Quote extends React.PureComponent {
   componentDidMount() {
     if (localStorage.getItem('quote') === 'false') return;
     if (localStorage.getItem('favouriteQuote')) this.setState({ favourited: <StarIcon className='copyButton' onClick={() => this.favourite()} /> });
+    if (localStorage.getItem('favouriteQuoteEnabled') === 'false') this.setState({ favourited: null });
     this.getQuote();
   }
 
@@ -102,8 +103,6 @@ export default class Quote extends React.PureComponent {
     let tweet = <TwitterIcon className='copyButton' onClick={() => window.open(`https://twitter.com/intent/tweet?text=${this.state.quote} - ${this.state.author} on @getmue`, '_blank').focus()}/>
     if (localStorage.getItem('tweetButton') === 'false') tweet = null;
 
-    if (localStorage.getItem('favouriteQuoteEnabled') === 'false') this.setState({ favourited: null });
-
     return (
         <div className='quotediv'>
           <h1 className='quote'>{`${this.state.quote}`}</h1>