diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java
index 2b63e3be37..ace2a1f06c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java
@@ -198,7 +198,6 @@ public abstract class MessageDatabase extends Database implements MmsSmsColumns,
   public abstract boolean isStory(long messageId);
   public abstract @NonNull Reader getOutgoingStoriesTo(@NonNull RecipientId recipientId);
   public abstract @NonNull Reader getAllOutgoingStories(boolean reverse, int limit);
-  public abstract @NonNull Reader getAllIncomingStoriesExceptOnboarding();
   public abstract @NonNull Reader getAllOutgoingStoriesAt(long sentTimestamp);
   public abstract @NonNull List<StoryResult> getOrderedStoryRecipientsAndIds(boolean isOutgoingOnly);
   public abstract @NonNull Reader getAllStoriesFor(@NonNull RecipientId recipientId, int limit);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
index 2dbee26cd9..0f81dde45f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -635,17 +635,6 @@ public class MmsDatabase extends MessageDatabase {
     return new Reader(rawQuery(where, null, reverse, limit));
   }
 
-  @Override
-  public @NonNull MessageDatabase.Reader getAllIncomingStoriesExceptOnboarding() {
-    RecipientId onboardingRecipientId = SignalStore.releaseChannelValues().getReleaseChannelRecipientId();
-    String where = IS_STORY_CLAUSE + " AND NOT (" + getOutgoingTypeClause() + ")";
-    if (onboardingRecipientId != null) {
-      where += " AND " + RECIPIENT_ID + " != " + onboardingRecipientId.serialize();
-    }
-
-    return new Reader(rawQuery(where, null, false, -1L));
-  }
-
   @Override
   public @NonNull MessageDatabase.Reader getAllOutgoingStoriesAt(long sentTimestamp) {
     String   where      = IS_STORY_CLAUSE + " AND " + DATE_SENT + " = ? AND (" + getOutgoingTypeClause() + ")";
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index cdb31a26c4..d4ee508a85 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -1448,11 +1448,6 @@ public class SmsDatabase extends MessageDatabase {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public @NonNull MessageDatabase.Reader getAllIncomingStoriesExceptOnboarding() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public @NonNull MessageDatabase.Reader getAllOutgoingStoriesAt(long sentTimestamp) {
     throw new UnsupportedOperationException();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsRepository.kt
index 027d4dbd84..de72a5a4c9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsRepository.kt
@@ -28,18 +28,10 @@ class StoriesPrivacySettingsRepository {
       Stories.onStorySettingsChanged(Recipient.self().id)
       ApplicationDependencies.resetAllNetworkConnections()
 
-      if (!isEnabled) {
-        SignalDatabase.mms.getAllOutgoingStories(false, -1).use { reader ->
-          reader.map { record -> record.id }
-        }.forEach { messageId ->
-          MessageSender.sendRemoteDelete(messageId, true)
-        }
-
-        SignalDatabase.mms.allIncomingStoriesExceptOnboarding.use { reader ->
-          reader.map { record -> record.id }
-        }.forEach { messageId ->
-          SignalDatabase.mms.deleteMessage(messageId)
-        }
+      SignalDatabase.mms.getAllOutgoingStories(false, -1).use { reader ->
+        reader.map { record -> record.id }
+      }.forEach { messageId ->
+        MessageSender.sendRemoteDelete(messageId, true)
       }
     }.subscribeOn(Schedulers.io())
   }