diff --git a/src/course-unit/CourseUnit.jsx b/src/course-unit/CourseUnit.jsx
index 0ff025f3dd..62d3ee869a 100644
--- a/src/course-unit/CourseUnit.jsx
+++ b/src/course-unit/CourseUnit.jsx
@@ -172,15 +172,17 @@ const CourseUnit = ({ courseId }) => {
                   setState={setUnitXBlocks}
                   updateOrder={finalizeXBlockOrder}
                 >
-                  <Button
-                    variant="outline-primary"
-                    iconBefore={isXBlocksExpanded ? ArrowUpIcon : ArrowDownIcon}
-                    onClick={handleExpandAll}
-                  >
-                    {isXBlocksExpanded
-                      ? intl.formatMessage(messages.collapseAllButton)
-                      : intl.formatMessage(messages.expandAllButton)}
-                  </Button>
+                  {unitXBlocks.length ? (
+                    <Button
+                      variant="outline-primary"
+                      iconBefore={isXBlocksExpanded ? ArrowUpIcon : ArrowDownIcon}
+                      onClick={handleExpandAll}
+                    >
+                      {isXBlocksExpanded
+                        ? intl.formatMessage(messages.collapseAllButton)
+                        : intl.formatMessage(messages.expandAllButton)}
+                    </Button>
+                  ) : null}
                   <SortableContext
                     id="root"
                     items={unitXBlocks}
diff --git a/src/course-unit/course-xblock/CourseXBlock.jsx b/src/course-unit/course-xblock/CourseXBlock.jsx
index bda450ebe0..2c675b4cba 100644
--- a/src/course-unit/course-xblock/CourseXBlock.jsx
+++ b/src/course-unit/course-xblock/CourseXBlock.jsx
@@ -16,7 +16,6 @@ import {
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { find } from 'lodash';
-import classNames from 'classnames';
 
 import DeleteModal from '../../generic/delete-modal/DeleteModal';
 import ConfigureModal from '../../generic/configure-modal/ConfigureModal';