diff --git a/frontend/src/component/album/toolbar.vue b/frontend/src/component/album/toolbar.vue
index c9b84f8e3..cc95bdb86 100644
--- a/frontend/src/component/album/toolbar.vue
+++ b/frontend/src/component/album/toolbar.vue
@@ -17,7 +17,7 @@
         <v-icon>edit</v-icon>
       </v-btn>
 
-      <v-btn v-if="$config.feature('share')" icon class="action-share" :title="$gettext('Share')"
+      <v-btn v-if="$config.feature('share') && hasPermission(aclResources.ResourceAlbums, aclActions.ActionShare)" icon class="action-share" :title="$gettext('Share')"
              @click.stop="dialog.share = true">
         <v-icon>share</v-icon>
       </v-btn>
@@ -37,8 +37,8 @@
         <v-icon>view_column</v-icon>
       </v-btn>
 
-      <v-btn v-if="!$config.values.readonly && $config.feature('upload')" icon class="hidden-sm-and-down action-upload"
-             :title="$gettext('Upload')" @click.stop="showUpload()">
+      <v-btn v-if="!$config.values.readonly && $config.feature('upload') && hasPermission(aclResources.ResourcePhotos, aclActions.ActionUpload)"
+        icon class="hidden-sm-and-down action-upload" :title="$gettext('Upload')" @click.stop="showUpload()">
         <v-icon>cloud_upload</v-icon>
       </v-btn>
     </v-toolbar>
diff --git a/frontend/src/pages/albums.vue b/frontend/src/pages/albums.vue
index 38f335126..515e548f0 100644
--- a/frontend/src/pages/albums.vue
+++ b/frontend/src/pages/albums.vue
@@ -184,7 +184,7 @@
             </v-card>
           </v-flex>
         </v-layout>
-        <div v-if="staticFilter.type === 'album' && config.count.albums === 0" class="text-xs-center my-2">
+        <div v-if="staticFilter.type === 'album' && config.count.albums === 0 && hasPermission(aclResources.ResourceAlbums, aclActions.ActionCreate)" class="text-xs-center my-2">
           <v-btn class="action-add" color="secondary" round @click.prevent="create">
             <translate>Add Album</translate>
           </v-btn>