1 files changed, 6 insertions, 8 deletions
diff --git a/internal/api/client/instance/instancepatch.go b/internal/api/client/instance/instancepatch.go
index a71d670b9..c30b5850e 100644
--- a/internal/api/client/instance/instancepatch.go
+++ b/internal/api/client/instance/instancepatch.go
@@ -178,19 +178,17 @@ func validateInstanceUpdate(form *apimodel.InstanceSettingsUpdateRequest) error
 		return errors.New("empty form submitted")
 	}
 
-	maxImageSize := config.GetMediaImageMaxSize()
-	maxDescriptionChars := config.GetMediaDescriptionMaxChars()
-
-	// validate avatar if present
 	if form.Avatar != nil {
+		maxImageSize := config.GetMediaImageMaxSize()
 		if size := form.Avatar.Size; size > int64(maxImageSize) {
 			return fmt.Errorf("file size limit exceeded: limit is %d bytes but desired instance avatar was %d bytes", maxImageSize, size)
 		}
+	}
 
-		if form.AvatarDescription != nil {
-			if length := len([]rune(*form.AvatarDescription)); length > maxDescriptionChars {
-				return fmt.Errorf("avatar description length must be less than %d characters (inclusive), but provided avatar description was %d chars", maxDescriptionChars, length)
-			}
+	if form.AvatarDescription != nil {
+		maxDescriptionChars := config.GetMediaDescriptionMaxChars()
+		if length := len([]rune(*form.AvatarDescription)); length > maxDescriptionChars {
+			return fmt.Errorf("avatar description length must be less than %d characters (inclusive), but provided avatar description was %d chars", maxDescriptionChars, length)
 		}
 	}