diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
index 2e788a06c40..583912ad236 100644
--- a/apps/files_sharing/css/public.scss
+++ b/apps/files_sharing/css/public.scss
@@ -169,3 +169,8 @@ thead {
 	opacity: .57;
 	margin-top: 10px;
 }
+
+#note {
+	text-align: center;
+	padding: 10px;
+}
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 0b30a599c7f..bd1331a0908 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -262,6 +262,7 @@ class ShareController extends AuthPublicShareController {
 		$shareTmpl['owner'] = $share->getShareOwner();
 		$shareTmpl['filename'] = $share->getNode()->getName();
 		$shareTmpl['directory_path'] = $share->getTarget();
+		$shareTmpl['note'] = $share->getNote();
 		$shareTmpl['mimetype'] = $share->getNode()->getMimetype();
 		$shareTmpl['previewSupported'] = $this->previewManager->isMimeSupported($share->getNode()->getMimetype());
 		$shareTmpl['dirToken'] = $this->getToken();
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 476f0851547..e337eb9b7f3 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -31,6 +31,11 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 <input type="hidden" name="maxSizeAnimateGif" value="<?php p($_['maxSizeAnimateGif']); ?>" id="maxSizeAnimateGif">
 <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?>
 	<div id="files-public-content">
+		<?php if (isset($_['note']) && $_['note'] !== '') : ?>
+		<div id="note">
+			<?php p($l->t('Note: ')); p($_['note']); ?>
+		</div>
+		<?php endif; ?>
 		<div id="preview">
 			<?php if (isset($_['folder'])): ?>
 				<?php print_unescaped($_['folder']); ?>