diff --git a/frontend/app/components/Session_/BugReport/BugReportModal.tsx b/frontend/app/components/Session_/BugReport/BugReportModal.tsx
index 34f264d96..da4fa64b7 100644
--- a/frontend/app/components/Session_/BugReport/BugReportModal.tsx
+++ b/frontend/app/components/Session_/BugReport/BugReportModal.tsx
@@ -82,9 +82,13 @@ function BugReportModal({ hideModal, session, width, height, account, xrayProps,
     fetchMembers()
     bugReportStore.updateReportDefaults(defaults);
     bugReportStore.setDefaultSteps(mapEvents(events));
-    return () => bugReportStore.clearStore();
   }, []);
 
+  const onClose = () => {
+    hideModal();
+    return bugReportStore.clearStore();
+  }
+
   const onGen = () => {
     // @ts-ignore
     import('html2canvas').then(({ default: html2canvas }) => {
@@ -192,7 +196,7 @@ function BugReportModal({ hideModal, session, width, height, account, xrayProps,
           <Button icon="file-pdf" variant="primary" onClick={onGen} loading={isRendering}>
             Download Bug Report
           </Button>
-          <Button variant="text-primary" onClick={hideModal}>
+          <Button variant="text-primary" onClick={onClose}>
             Close
           </Button>
         </div>