diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
index fe6f249b0b..66482c9c57 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -356,7 +356,8 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
                       // Sending a Data extraction notification (for incoming attachments only)
                       boolean containsIncoming = mediaRecords.parallelStream().anyMatch(m -> !m.isOutgoing());
                       if (containsIncoming) {
-                        sendMediaSavedNotificationIfNeeded();
+                        //TODO uncomment line below when Data extraction will be activated
+                        //sendMediaSavedNotificationIfNeeded();
                       }
                     }
                   }.execute();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 876a33d09a..6edfca5e9d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -354,7 +354,8 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
                         new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
                 // Sending a Data extraction notification (for incoming attachments only)
                 if(!mediaItem.outgoing) {
-                  sendMediaSavedNotificationIfNeeded();
+                  //TODO uncomment line below when Data extraction will be activated
+                  //sendMediaSavedNotificationIfNeeded();
                 }
               })
               .execute();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 32668cb247..2aedad1119 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -748,7 +748,8 @@ public class ConversationFragment extends Fragment
                   saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, attachments.toArray(new SaveAttachmentTask.Attachment[0]));
                   // Sending a Data extraction notification (for incoming attachments only)
                   if(!message.isOutgoing()) {
-                    sendMediaSavedNotificationIfNeeded();
+                    //TODO uncomment line below when Data extraction will be activated
+                    //sendMediaSavedNotificationIfNeeded();
                   }
                   return;
                 }