diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index 92c66cd53c2..ac55bdaf498 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -177,14 +177,6 @@ Discourse.Utilities = {
       }
     }
 
-    // check file size
-    var fileSizeKB = file.size / 1024;
-    var maxSizeKB = 10 * 1024; // 10MB
-    if (fileSizeKB > maxSizeKB) {
-      bootbox.alert(I18n.t('post.errors.file_too_large', { max_size_kb: maxSizeKB }));
-      return false;
-    }
-
     // everything went fine
     return true;
   },
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c639543923f..3dd9f030544 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -510,12 +510,8 @@ email:
   short_email_length: 2800
 
 files:
-  max_image_size_kb:
-    client: true
-    default: 3072
-  max_attachment_size_kb:
-    client: true
-    default: 3072
+  max_image_size_kb: 3072
+  max_attachment_size_kb: 3072
   authorized_extensions:
     client: true
     default: 'jpg|jpeg|png|gif'
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index 68612e7530f..6f43509e19e 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -63,8 +63,6 @@ Discourse.SiteSettingsOriginal = {
   "default_code_lang":"lang-auto",
   "autohighlight_all_code":false,
   "email_in":false,
-  "max_image_size_kb":3072,
-  "max_attachment_size_kb":1024,
   "authorized_extensions":".jpg|.jpeg|.png|.gif|.svg|.txt|.ico|.yml",
   "max_image_width":690,
   "max_image_height":500,
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6
index 2f94980b312..8d0fd1c1d99 100644
--- a/test/javascripts/lib/utilities-test.js.es6
+++ b/test/javascripts/lib/utilities-test.js.es6
@@ -51,16 +51,6 @@ test("ensures an authorized upload", function() {
   ok(bootbox.alert.calledWith(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: extensions })));
 });
 
-test("prevents files that are too big from being uploaded", function() {
-  Discourse.User.resetCurrent(Discourse.User.create());
-  var image = { name: "image.png", size: 11 * 1024 * 1024 };
-  Discourse.User.currentProp("trust_level", 1);
-  sandbox.stub(bootbox, "alert");
-
-  not(validUpload([image]));
-  ok(bootbox.alert.calledWith(I18n.t('post.errors.file_too_large', { max_size_kb: 10 * 1024 })));
-});
-
 var imageSize = 10 * 1024;
 
 var dummyBlob = function() {
@@ -77,8 +67,6 @@ var dummyBlob = function() {
 test("allows valid uploads to go through", function() {
   Discourse.User.resetCurrent(Discourse.User.create());
   Discourse.User.currentProp("trust_level", 1);
-  Discourse.SiteSettings.max_image_size_kb = 15;
-  Discourse.SiteSettings.max_attachment_size_kb = 1;
   sandbox.stub(bootbox, "alert");
 
   // image