diff --git a/src/features/releaseNotes/components/ReleaseNotesListComponent.js b/src/features/releaseNotes/components/ReleaseNotesListComponent.js
index f7f85c2..4cfed00 100644
--- a/src/features/releaseNotes/components/ReleaseNotesListComponent.js
+++ b/src/features/releaseNotes/components/ReleaseNotesListComponent.js
@@ -1,9 +1,9 @@
 import React from "react";
 import { makeStyles } from "@material-ui/core/styles";
 import {
-  ExpansionPanel,
-  ExpansionPanelSummary,
-  ExpansionPanelDetails
+  Accordion,
+  AccordionSummary,
+  AccordionDetails
 } from "@material-ui/core";
 import ExpandMoreIcon from "@material-ui/icons/ExpandMore";
 import PropTypes from "prop-types";
@@ -23,7 +23,7 @@ const ReleaseNotesListComponent = ({
   const classes = useStyles();
   const { t } = useTranslation();
 
-  const getCollapsed = (version) => {
+  const getCollapsed = version => {
     const flag = notesFlags[version];
     const collapsed = !flag || flag === false;
     return collapsed;
@@ -36,13 +36,10 @@ const ReleaseNotesListComponent = ({
         <Spinner />
       ) : (
         releaseNotes.loaded &&
-        releaseNotes.map((note) => {
+        releaseNotes.map(note => {
           return (
-            <ExpansionPanel
-              key={note.version}
-              onChange={handleToggle(note.version)}
-            >
-              <ExpansionPanelSummary
+            <Accordion key={note.version} onChange={handleToggle(note.version)}>
+              <AccordionSummary
                 expandIcon={<ExpandMoreIcon />}
                 id={`panel-${note.version}-header`}
               >
@@ -50,11 +47,11 @@ const ReleaseNotesListComponent = ({
                   releaseNote={note}
                   collapsed={getCollapsed(note.version)}
                 />
-              </ExpansionPanelSummary>
-              <ExpansionPanelDetails>
+              </AccordionSummary>
+              <AccordionDetails>
                 <ReleaseNotesComponent releaseNote={note} />
-              </ExpansionPanelDetails>
-            </ExpansionPanel>
+              </AccordionDetails>
+            </Accordion>
           );
         })
       )}
diff --git a/src/features/session/components/SessionListComponent.js b/src/features/session/components/SessionListComponent.js
index 4bf8367..3c4b32d 100644
--- a/src/features/session/components/SessionListComponent.js
+++ b/src/features/session/components/SessionListComponent.js
@@ -1,9 +1,9 @@
 import React from "react";
 import { makeStyles } from "@material-ui/core/styles";
 import {
-  ExpansionPanel,
-  ExpansionPanelSummary,
-  ExpansionPanelDetails
+  Accordion,
+  AccordionSummary,
+  AccordionDetails
 } from "@material-ui/core";
 import ExpandMoreIcon from "@material-ui/icons/ExpandMore";
 import PropTypes from "prop-types";
@@ -31,28 +31,28 @@ const SessionListComponent = ({
         <Spinner />
       ) : (
         sessions.loaded &&
-        sessions.map((session) => {
+        sessions.map(session => {
           return (
-            <ExpansionPanel
+            <Accordion
               key={session.sessionId}
               onChange={handleToggle(session.sessionId)}
             >
-              <ExpansionPanelSummary
+              <AccordionSummary
                 expandIcon={<ExpandMoreIcon />}
                 aria-controls={`panel-${session.sessionId}-content`}
                 id={`panel-${session.sessionId}-header`}
               >
                 <SessionSummary session={session} />
-              </ExpansionPanelSummary>
-              <ExpansionPanelDetails>
+              </AccordionSummary>
+              <AccordionDetails>
                 <SessionForwardsComponent
                   session={session}
                   forwards={forwards[session.sessionId]}
                   openOptionsDialog={openOptionsDialog}
                   showSessionInfo={true}
                 />
-              </ExpansionPanelDetails>
-            </ExpansionPanel>
+              </AccordionDetails>
+            </Accordion>
           );
         })
       )}