diff --git a/lib/Sabre/Album/PublicAlbumRoot.php b/lib/Sabre/Album/PublicAlbumRoot.php
index 54ccaa87f..f53c4a596 100644
--- a/lib/Sabre/Album/PublicAlbumRoot.php
+++ b/lib/Sabre/Album/PublicAlbumRoot.php
@@ -53,15 +53,7 @@ protected function getPhotosLocationInfo() {
 	}
 
 	protected function addFile(int $sourceId, string $ownerUID): bool {
-		// TODO: implement public album upload
 		throw new Forbidden('Not allowed to create a file in a public album');
-
-		if (in_array($sourceId, $this->album->getFileIds())) {
-			throw new Conflict("File $sourceId is already in the folder");
-		}
-
-		$this->albumMapper->addFile($this->album->getAlbum()->getId(), $sourceId, $ownerUID);
-		return true;
 	}
 
 	// Do not reveal collaborators for public albums.
diff --git a/src/views/PublicAlbumContent.vue b/src/views/PublicAlbumContent.vue
index 6d263ad3e..7511e5211 100644
--- a/src/views/PublicAlbumContent.vue
+++ b/src/views/PublicAlbumContent.vue
@@ -38,11 +38,6 @@
 				:root-title="albumOriginalName"
 				:title="albumOriginalName"
 				@refresh="fetchAlbumContent">
-				<!-- TODO: enable upload on public albums -->
-				<!-- <UploadPicker :accept="allowedMimes"
-				:destination="folder.filename"
-				:multiple="true"
-				@uploaded="onUpload" /> -->
 				<div v-if="album.location !== ''" slot="subtitle" class="album__location">
 					<MapMarker />{{ album.location }}
 				</div>