diff --git a/package.json b/package.json
index d88bb48280..48ccfce39f 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.16.90",
+  "version": "0.16.91",
   "myplanet": {
     "latest": "v0.22.63",
     "min": "v0.21.63"
diff --git a/src/app/manager-dashboard/reports/logs-myplanet.component.html b/src/app/manager-dashboard/reports/logs-myplanet.component.html
index 5b0f0318b4..139a9e9fdc 100644
--- a/src/app/manager-dashboard/reports/logs-myplanet.component.html
+++ b/src/app/manager-dashboard/reports/logs-myplanet.component.html
@@ -14,7 +14,7 @@
     <mat-toolbar-row class="primary-color font-size-1">
       <span i18n>myPlanet</span>
       <span class="toolbar-fill"></span>
-      <button mat-raised-button color="accent" (click)="exportAll()">
+      <button mat-raised-button color="accent" (click)="exportAll()" *ngIf="!isEmpty">
         Export All
       </button>
     </mat-toolbar-row>
@@ -26,7 +26,7 @@
           <mat-panel-title>{{planet.nameDoc?.name || planet.doc?.name}} ({{planet.children.length}})</mat-panel-title>
         </mat-expansion-panel-header>
         <planet-myplanet-table dataType="logs" [data]="planet.children"></planet-myplanet-table>
-        <button mat-raised-button color="accent" (click)="exportSingle(planet)" style="margin-right: 2rem;">
+        <button mat-raised-button color="accent" (click)="exportSingle(planet)" style="margin-right: 2rem;" *ngIf="!isEmpty">
           Export
         </button>
       </mat-expansion-panel>
diff --git a/src/app/manager-dashboard/reports/reports-myplanet.component.html b/src/app/manager-dashboard/reports/reports-myplanet.component.html
index 8f10c8ea16..be28943441 100755
--- a/src/app/manager-dashboard/reports/reports-myplanet.component.html
+++ b/src/app/manager-dashboard/reports/reports-myplanet.component.html
@@ -29,7 +29,7 @@
     <mat-toolbar-row class="primary-color font-size-1">
       <span i18n>myPlanet on { planetType, select, center {Nations} other {Communities} }</span>
       <span class="toolbar-fill"></span>
-      <button mat-raised-button color="accent" (click)="exportAll()">
+      <button mat-raised-button color="accent" (click)="exportAll()" *ngIf="!isEmpty">
         Export All
       </button>
     </mat-toolbar-row>
@@ -41,7 +41,7 @@
           <mat-panel-title>{{planet.nameDoc?.name || planet.doc?.name}} ({{planet.children.length}})</mat-panel-title>
         </mat-expansion-panel-header>
         <planet-myplanet-table [data]="planet.children"></planet-myplanet-table>
-        <button mat-raised-button color="accent" (click)="exportSingle(planet)" style="margin-right: 2rem;">
+        <button mat-raised-button color="accent" (click)="exportSingle(planet)" style="margin-right: 2rem;" *ngIf="!isEmpty">
           Export
         </button>
       </mat-expansion-panel>