diff --git a/src/main/webapp/app/pages/actionableGenesPage/ActionableGenesPage.tsx b/src/main/webapp/app/pages/actionableGenesPage/ActionableGenesPage.tsx
index 72c8829f2..d5178f66f 100644
--- a/src/main/webapp/app/pages/actionableGenesPage/ActionableGenesPage.tsx
+++ b/src/main/webapp/app/pages/actionableGenesPage/ActionableGenesPage.tsx
@@ -368,12 +368,14 @@ export default class ActionableGenesPage extends React.Component<
   @computed
   get allFdaTreatments() {
     const treatments: Treatment[] = [];
-    this.allOncokbTreatments.map(treatment => {
-      treatments.push({
-        ...treatment,
-        level: treatment.fdaLevel,
-      } as Treatment);
-    });
+    this.allOncokbTreatments
+      .filter(treatment => treatment.fdaLevel)
+      .map(treatment => {
+        treatments.push({
+          ...treatment,
+          level: treatment.fdaLevel,
+        } as Treatment);
+      });
     return treatments;
   }
 
@@ -563,6 +565,11 @@ export default class ActionableGenesPage extends React.Component<
     return !!this.collapseStatus[LEVEL_TYPES.FDA];
   }
 
+  @computed
+  get oncokbTableKey() {
+    return this.fdaSectionIsOpen ? 'paginated' : 'non-paginated';
+  }
+
   @autobind
   @action
   clearFilters() {
@@ -847,7 +854,7 @@ export default class ActionableGenesPage extends React.Component<
   getTable() {
     // We need to render two tables, one with fixed header, one with pagination.
     // Once page size is specified in the fixed header table, it cannot be overwritten by the defaultPageSize
-    return <OncoKBTable {...this.oncokbTableProps} />;
+    return <OncoKBTable key={this.oncokbTableKey} {...this.oncokbTableProps} />;
   }
 
   @computed