diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index db7c4114c97..d3accb5078b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1282,6 +1282,10 @@ en:
 
         [Please review them in the admin section](%{base_url}/admin/users/list/pending).
 
+    download_remote_images_disabled:
+      subject_template: "Download remote images has been disabled"
+      text_body_template: "You previously had the `download_remote_images_to_local` setting enabled but the `download_remote_images_threshold` has been hit."
+
   unsubscribe_link: "To unsubscribe from these emails, visit your [user preferences](%{user_preferences_url})."
 
   user_notifications:
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index ae97793a8e3..f25053b910d 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -236,6 +236,7 @@ class CookedPostProcessor
   def disable_if_low_on_disk_space
     if available_disk_space < SiteSetting.download_remote_images_threshold
       SiteSetting.download_remote_images_to_local = false
+      SystemMessage.create(Discourse.site_contact_user, :download_remote_images_disabled)
       return true
     end
     false
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 93c13a213fb..850ff3d1cf3 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -295,32 +295,37 @@ describe CookedPostProcessor do
 
       before { SiteSetting.stubs(:download_remote_images_to_local).returns(true) }
 
-      it "runs only when a user updated the post" do
-        post.last_editor_id = Discourse.system_user.id
+      it "does not run when there is not enough disk space" do
+        cpp.expects(:disable_if_low_on_disk_space).returns(true)
         Jobs.expects(:cancel_scheduled_job).never
         cpp.pull_hotlinked_images
       end
 
-      it "disables download when disk space is low" do
-        SiteSetting.expects(:download_remote_images_threshold).returns(20)
-        cpp.expects(:available_disk_space).returns(10)
-        Jobs.expects(:cancel_scheduled_job).never
-        cpp.pull_hotlinked_images
-      end
+      context "and there is enough disk space" do
 
-      context "and the post has been updated by a user" do
-
-        before { post.id = 42 }
-
-        it "ensures only one job is scheduled right after the ninja_edit_window" do
-          Jobs.expects(:cancel_scheduled_job).with(:pull_hotlinked_images, post_id: post.id).once
-
-          delay = SiteSetting.ninja_edit_window + 1
-          Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id, bypass_bump: false).once
+        before { cpp.expects(:disable_if_low_on_disk_space).returns(false) }
 
+        it "does not run when the system user updated the post" do
+          post.last_editor_id = Discourse.system_user.id
+          Jobs.expects(:cancel_scheduled_job).never
           cpp.pull_hotlinked_images
         end
 
+        context "and the post has been updated by an actual user" do
+
+          before { post.id = 42 }
+
+          it "ensures only one job is scheduled right after the ninja_edit_window" do
+            Jobs.expects(:cancel_scheduled_job).with(:pull_hotlinked_images, post_id: post.id).once
+
+            delay = SiteSetting.ninja_edit_window + 1
+            Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id, bypass_bump: false).once
+
+            cpp.pull_hotlinked_images
+          end
+
+        end
+
       end
 
     end
@@ -340,10 +345,16 @@ describe CookedPostProcessor do
       cpp.disable_if_low_on_disk_space.should == false
     end
 
-    it "disables download_remote_images_threshold when there's not enough disk space" do
-      SiteSetting.expects(:download_remote_images_threshold).returns(75)
-      cpp.disable_if_low_on_disk_space.should == true
-      SiteSetting.download_remote_images_to_local.should == false
+    context "when there's not enough disk space" do
+
+      before { SiteSetting.expects(:download_remote_images_threshold).returns(75) }
+
+      it "disables download_remote_images_threshold and send a notification to the admin" do
+        SystemMessage.expects(:create).with(Discourse.site_contact_user, :download_remote_images_disabled).once
+        cpp.disable_if_low_on_disk_space.should == true
+        SiteSetting.download_remote_images_to_local.should == false
+      end
+
     end
 
   end