diff --git a/Changelog.md b/Changelog.md
index 16646e623..fc4830613 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@
 * Remove title from profile photo upload button [#7551](https://github.com/diaspora/diaspora/pull/7551)
 * Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557)
 * Sort notifications by last interaction [#7568](https://github.com/diaspora/diaspora/pull/7568)
+* Remove tiff support from photos [#7576](https://github.com/diaspora/diaspora/pull/7576)
 
 ## Bug fixes
 * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
diff --git a/app/assets/javascripts/app/views/publisher/uploader_view.js b/app/assets/javascripts/app/views/publisher/uploader_view.js
index 26541c794..e03f6c9d1 100644
--- a/app/assets/javascripts/app/views/publisher/uploader_view.js
+++ b/app/assets/javascripts/app/views/publisher/uploader_view.js
@@ -5,7 +5,7 @@
 // progress. Attaches previews of finished uploads to the publisher.
 
 app.views.PublisherUploader = Backbone.View.extend({
-  allowedExtensions: ["jpg", "jpeg", "png", "gif", "tif", "tiff"],
+  allowedExtensions: ["jpg", "jpeg", "png", "gif"],
   sizeLimit: 4194304,  // bytes
 
   initialize: function(opts) {
diff --git a/app/assets/javascripts/mobile/mobile_file_uploader.js b/app/assets/javascripts/mobile/mobile_file_uploader.js
index 3a33ef5ee..567015c14 100644
--- a/app/assets/javascripts/mobile/mobile_file_uploader.js
+++ b/app/assets/javascripts/mobile/mobile_file_uploader.js
@@ -19,7 +19,7 @@ function createUploader(){
       }
     },
     validation: {
-      allowedExtensions: ["jpg", "jpeg", "png", "gif", "tif", "tiff"],
+      allowedExtensions: ["jpg", "jpeg", "png", "gif"],
       sizeLimit: 4194304
     },
     button: document.getElementById("file-upload-publisher"),
diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 226d4fd47..c75e67bb3 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -10,7 +10,7 @@ class ProcessedImage < CarrierWave::Uploader::Base
   end
 
   def extension_whitelist
-    %w[jpg jpeg png gif tiff]
+    %w[jpg jpeg png gif]
   end
 
   def filename