diff --git a/dbrepo-ui/components/database/DatabaseToolbar.vue b/dbrepo-ui/components/database/DatabaseToolbar.vue
index 642f75a529194b2524cb1e5bd9cf08a68013782f..16dae8482cd1bf682a8aa80a1b32731966ec1248 100644
--- a/dbrepo-ui/components/database/DatabaseToolbar.vue
+++ b/dbrepo-ui/components/database/DatabaseToolbar.vue
@@ -162,6 +162,12 @@ export default {
       return this.roles.includes('create-table')
     },
     canViewSubsets () {
+      if (!this.database) {
+        return false
+      }
+      if (this.database.is_public) {
+        return true
+      }
       return this.hasReadAccess
     },
     isOwner () {