diff --git a/app/soapbox/components/status_content.js b/app/soapbox/components/status_content.js
index 0e5d066ea..508e2de1f 100644
--- a/app/soapbox/components/status_content.js
+++ b/app/soapbox/components/status_content.js
@@ -265,15 +265,16 @@ class StatusContent extends React.PureComponent {
       }
 
       if (status.get('poll')) {
-        output.push(<PollContainer pollId={status.get('poll')} />);
+        output.push(<PollContainer pollId={status.get('poll')} key='poll' />);
       }
 
       return output;
     } else {
       const output = [
         <div
-          tabIndex='0'
           ref={this.setRef}
+          tabIndex='0'
+          key='content'
           className={classnames('status__content', {
             'status__content--big': onlyEmoji,
           })}
@@ -284,7 +285,7 @@ class StatusContent extends React.PureComponent {
       ];
 
       if (status.get('poll')) {
-        output.push(<PollContainer pollId={status.get('poll')} />);
+        output.push(<PollContainer pollId={status.get('poll')} key='poll' />);
       }
 
       return output;
diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js
index 03890cb26..3f9ad0f0c 100644
--- a/app/soapbox/features/status/index.js
+++ b/app/soapbox/features/status/index.js
@@ -109,8 +109,8 @@ const makeMapStateToProps = () => {
 
   const mapStateToProps = (state, props) => {
     const status = getStatus(state, { id: props.params.statusId });
-    let ancestorsIds = Immutable.List();
-    let descendantsIds = Immutable.List();
+    let ancestorsIds = Immutable.OrderedSet();
+    let descendantsIds = Immutable.OrderedSet();
 
     if (status) {
       ancestorsIds = getAncestorsIds(state, { id: state.getIn(['contexts', 'inReplyTos', status.get('id')]) });
@@ -146,8 +146,8 @@ class Status extends ImmutablePureComponent {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     status: ImmutablePropTypes.map,
-    ancestorsIds: ImmutablePropTypes.list,
-    descendantsIds: ImmutablePropTypes.list,
+    ancestorsIds: ImmutablePropTypes.orderedSet,
+    descendantsIds: ImmutablePropTypes.orderedSet,
     intl: PropTypes.object.isRequired,
     askReplyConfirmation: PropTypes.bool,
     domain: PropTypes.string,