diff --git a/app/soapbox/components/hashtag.js b/app/soapbox/components/hashtag.js
index 162534d50..2a0017c9c 100644
--- a/app/soapbox/components/hashtag.js
+++ b/app/soapbox/components/hashtag.js
@@ -12,16 +12,16 @@ const Hashtag = ({ hashtag }) => (
         #<span>{hashtag.get('name')}</span>
       </Permalink>
 
-      <div className='trends__item__count'>
+      {hashtag.get('history') && <div className='trends__item__count'>
         <FormattedMessage id='trends.count_by_accounts' defaultMessage='{count} {rawCount, plural, one {person} other {people}} talking' values={{ rawCount: hashtag.getIn(['history', 0, 'accounts']), count: <strong>{shortNumberFormat(hashtag.getIn(['history', 0, 'accounts']))}</strong> }} />
-      </div>
+      </div>}
     </div>
 
-    <div className='trends__item__sparkline'>
+    {hashtag.get('history') && <div className='trends__item__sparkline'>
       <Sparklines width={50} height={28} data={hashtag.get('history').reverse().map(day => day.get('uses')).toArray()}>
         <SparklinesCurve style={{ fill: 'none' }} />
       </Sparklines>
-    </div>
+    </div>}
   </div>
 );
 
diff --git a/app/soapbox/features/compose/components/search_results.js b/app/soapbox/features/compose/components/search_results.js
index a5e243ade..ca0d56b11 100644
--- a/app/soapbox/features/compose/components/search_results.js
+++ b/app/soapbox/features/compose/components/search_results.js
@@ -21,7 +21,7 @@ class SearchResults extends ImmutablePureComponent {
 
   static propTypes = {
     results: ImmutablePropTypes.map.isRequired,
-    features: PropTypes.node,
+    features: PropTypes.object,
     intl: PropTypes.object.isRequired,
   };
 
diff --git a/app/soapbox/pages/search_page.js b/app/soapbox/pages/search_page.js
index e00ad19cf..58a902b5a 100644
--- a/app/soapbox/pages/search_page.js
+++ b/app/soapbox/pages/search_page.js
@@ -44,7 +44,7 @@ const SearchPage = ({ children, features }) => (
 
 SearchPage.propTypes = {
   children: PropTypes.node,
-  features: PropTypes.node,
+  features: PropTypes.object,
 };
 
 export default connect(mapStateToProps)(SearchPage);