diff --git a/zerver/lib/events.py b/zerver/lib/events.py
index 98ee890051..c6f404a6ff 100644
--- a/zerver/lib/events.py
+++ b/zerver/lib/events.py
@@ -241,7 +241,7 @@ def fetch_initial_state_data(
         state["realm_presence_disabled"] = True if user_profile is None else realm.presence_disabled
 
         # Important: Encode units in the client-facing API name.
-        state["max_avatar_file_size_mib"] = settings.MAX_AVATAR_FILE_SIZE
+        state["max_avatar_file_size_mib"] = settings.MAX_AVATAR_FILE_SIZE_MIB
         state["max_file_upload_size_mib"] = settings.MAX_FILE_UPLOAD_SIZE
         state["max_icon_file_size_mib"] = settings.MAX_ICON_FILE_SIZE
         state["realm_upload_quota_mib"] = realm.upload_quota_bytes()
diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py
index 0718268a06..0fafff8e5e 100644
--- a/zerver/tests/test_upload.py
+++ b/zerver/tests/test_upload.py
@@ -1238,7 +1238,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
     def test_avatar_upload_file_size_error(self) -> None:
         self.login("hamlet")
         with get_test_image_file(self.correct_files[0][0]) as fp:
-            with self.settings(MAX_AVATAR_FILE_SIZE=0):
+            with self.settings(MAX_AVATAR_FILE_SIZE_MIB=0):
                 result = self.client_post("/json/users/me/avatar", {"file": fp})
         self.assert_json_error(result, "Uploaded file is larger than the allowed limit of 0 MiB")
 
diff --git a/zerver/views/user_settings.py b/zerver/views/user_settings.py
index c45d3d0e73..e58c4d0f39 100644
--- a/zerver/views/user_settings.py
+++ b/zerver/views/user_settings.py
@@ -297,10 +297,10 @@ def set_avatar_backend(request: HttpRequest, user_profile: UserProfile) -> HttpR
         return json_error(str(AVATAR_CHANGES_DISABLED_ERROR))
 
     user_file = list(request.FILES.values())[0]
-    if (settings.MAX_AVATAR_FILE_SIZE * 1024 * 1024) < user_file.size:
+    if (settings.MAX_AVATAR_FILE_SIZE_MIB * 1024 * 1024) < user_file.size:
         return json_error(
             _("Uploaded file is larger than the allowed limit of {} MiB").format(
-                settings.MAX_AVATAR_FILE_SIZE,
+                settings.MAX_AVATAR_FILE_SIZE_MIB,
             )
         )
     upload_avatar_image(user_file, user_profile, user_profile)
diff --git a/zproject/default_settings.py b/zproject/default_settings.py
index 80975db7b0..8856558eb3 100644
--- a/zproject/default_settings.py
+++ b/zproject/default_settings.py
@@ -307,7 +307,7 @@ ZULIP_IOS_APP_ID = "org.zulip.Zulip"
 
 # Limits related to the size of file uploads; last few in MB.
 DATA_UPLOAD_MAX_MEMORY_SIZE = 25 * 1024 * 1024
-MAX_AVATAR_FILE_SIZE = 5
+MAX_AVATAR_FILE_SIZE_MIB = 5
 MAX_ICON_FILE_SIZE = 5
 MAX_LOGO_FILE_SIZE = 5
 MAX_EMOJI_FILE_SIZE = 5