diff --git a/apps/settings/templates/settings/personal/personal.info.php b/apps/settings/templates/settings/personal/personal.info.php
index c1a5735aa8fdf..959f59eaf34f5 100644
--- a/apps/settings/templates/settings/personal/personal.info.php
+++ b/apps/settings/templates/settings/personal/personal.info.php
@@ -65,6 +65,7 @@
 
 				<div id="cropper" class="hidden">
 					<div class="inner-container">
+						<p style="width: 300px; margin-top: 0.5rem"><?php p($l->t('Please note that it can take up to 24 hours for the avatar to get updated everywhere.')); ?></p>
 						<div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div>
 						<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div>
 					</div>
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 3b87bf15b2ffa..a567baf586720 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -134,7 +134,7 @@ public function getAvatar($userId, $size) {
 		}
 
 		// Cache for 1 day
-		$response->cacheFor(60 * 60 * 24);
+		$response->cacheFor(60 * 60 * 24, false, true);
 		return $response;
 	}