diff --git a/js/components/ascribe_accordion_list/accordion_list_item_table.js b/js/components/ascribe_accordion_list/accordion_list_item_table.js
index 9f92c006..92ff6d55 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_table.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_table.js
@@ -21,34 +21,26 @@ let AccordionListItemTable = React.createClass({
     },
 
     render() {
-        if(this.props.show && this.props.itemList) {
-            return (
-                <Table
-                    responsive
-                    className="ascribe-table"
-                    columnList={this.props.columnList}
-                    itemList={this.props.itemList}
-                    changeOrder={this.props.changeOrder}
-                    orderBy={this.props.orderBy}
-                    orderAsc={this.props.orderAsc}>
-                    {this.props.itemList.map((item, i) => {
-                        return (
-                             <TableItemSelectable
-                                className="ascribe-table-item-selectable"
-                                key={i}
-                                selectItem={this.props.selectItem}
-                                parentId={this.props.parentId}/>
-                        );
-                    })}
-                </Table>
-            );
-        } else {
-            return (
-                <div className={this.props.className}>
-                    {this.props.children}
-                </div>
-            );
-        }
+        return (
+            <Table
+                responsive
+                className="ascribe-table"
+                columnList={this.props.columnList}
+                itemList={this.props.itemList}
+                changeOrder={this.props.changeOrder}
+                orderBy={this.props.orderBy}
+                orderAsc={this.props.orderAsc}>
+                {this.props.itemList.map((item, i) => {
+                    return (
+                         <TableItemSelectable
+                            className="ascribe-table-item-selectable"
+                            key={i}
+                            selectItem={this.props.selectItem}
+                            parentId={this.props.parentId}/>
+                    );
+                })}
+            </Table>
+        );
     }
 });
 
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
index 1a34464d..1f0959d5 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
@@ -179,27 +179,27 @@ let AccordionListItemTableEditions = React.createClass({
 
         let loadingSpinner = <span className="glyph-ascribe-spool-chunked ascribe-color spin"/>;
 
-        return (
-            <div className={this.props.className}>
-                {/* <AccordionListItemTableToggle
-                    className="ascribe-accordion-list-table-toggle"
-                    onClick={this.toggleTable}
-                    message={show && typeof editionsForPiece !== 'undefined' ? <span><span className="glyphicon glyphicon-menu-up" aria-hidden="true" style={{top: 2}}></span> {getLangText('Hide editions')}</span> : <span><span className="glyphicon glyphicon-menu-down" aria-hidden="true" style={{top: 2}}></span> {getLangText('Show editions')} {show && typeof editionsForPiece === 'undefined' ? loadingSpinner : null}</span>} /> */}
-                <AccordionListItemTable
-                    parentId={this.props.parentId}
-                    itemList={editionsForPiece}
-                    columnList={columnList}
-                    show={show}
-                    orderBy={orderBy}
-                    orderAsc={orderAsc}
-                    changeOrder={this.changeEditionListOrder} 
-                    selectItem={this.selectItem}/>
-                <AccordionListItemTableToggle
-                    className="ascribe-accordion-list-table-toggle"
-                    onClick={this.loadFurtherEditions}
-                    message={show && showExpandOption ? <span><span className="glyphicon glyphicon-option-horizontal" aria-hidden="true" style={{top: 3}}></span> Show me more {this.state.showMoreLoading ? loadingSpinner : null}</span> : ''} />
-            </div>
-        );
+        if(show && editionsForPiece && editionsForPiece.length > 0) {
+            return (
+                <div className={this.props.className}>
+                    <AccordionListItemTable
+                        parentId={this.props.parentId}
+                        itemList={editionsForPiece}
+                        columnList={columnList}
+                        show={show}
+                        orderBy={orderBy}
+                        orderAsc={orderAsc}
+                        changeOrder={this.changeEditionListOrder}
+                        selectItem={this.selectItem}/>
+                    <AccordionListItemTableToggle
+                        className="ascribe-accordion-list-table-toggle"
+                        onClick={this.loadFurtherEditions}
+                        message={show && showExpandOption ? <span><span className="glyphicon glyphicon-option-horizontal" aria-hidden="true" style={{top: 3}}></span> Show me more {this.state.showMoreLoading ? loadingSpinner : null}</span> : ''} />
+                </div>
+            );
+        } else {
+            return null;
+        }
     }
 });