diff --git a/app/assets/javascripts/ckeditor/config.js b/app/assets/javascripts/ckeditor/config.js
index 422182e05..22c4ab028 100644
--- a/app/assets/javascripts/ckeditor/config.js
+++ b/app/assets/javascripts/ckeditor/config.js
@@ -8,13 +8,9 @@ CKEDITOR.editorConfig = function( config )
 
   config.forcePasteAsPlainText = true;
 
-  config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
-  config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files";
-  config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files";
   config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures";
   config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
   config.filebrowserImageUploadUrl = "/ckeditor/pictures";
-  config.filebrowserUploadUrl = "/ckeditor/attachment_files";
   config.filebrowserUploadMethod = "form";
 
   config.allowedContent = true;
diff --git a/spec/features/ckeditor_spec.rb b/spec/features/ckeditor_spec.rb
index 8a8b9d9f2..35e9d360a 100644
--- a/spec/features/ckeditor_spec.rb
+++ b/spec/features/ckeditor_spec.rb
@@ -30,4 +30,15 @@ describe "CKEditor" do
 
     expect(page).to have_css "img[src$='clippy.jpg']"
   end
+
+  scenario "cannot upload attachments through link tab", :js do
+    login_as(create(:administrator).user)
+    visit new_admin_site_customization_page_path
+
+    find(".cke_button__link").click
+
+    expect(page).to have_css(".cke_dialog")
+    expect(page).not_to have_link "Upload"
+    expect(page).not_to have_link "Browse Server"
+  end
 end