diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
index ce53f68916..b1250929f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
@@ -112,7 +112,6 @@ public final class Megaphones {
   private static Map<Event, MegaphoneSchedule> buildDisplayOrder(@NonNull Context context, @NonNull Map<Event, MegaphoneRecord> records) {
     return new LinkedHashMap<>() {{
       put(Event.PINS_FOR_ALL, new PinsForAllSchedule());
-      put(Event.UPDATE_PIN_AFTER_AEP_REGISTRATION, new UpdatePinAfterAepRegistrationSchedule());
       put(Event.CLIENT_DEPRECATED, SignalStore.misc().isClientDeprecated() ? ALWAYS : NEVER);
       put(Event.NEW_LINKED_DEVICE, shouldShowNewLinkedDeviceMegaphone() ? ALWAYS: NEVER);
       put(Event.NOTIFICATIONS, shouldShowNotificationsMegaphone(context) ? RecurringSchedule.every(TimeUnit.DAYS.toMillis(30)) : NEVER);
@@ -175,8 +174,6 @@ public final class Megaphones {
         return buildPnpLaunchMegaphone();
       case NEW_LINKED_DEVICE:
         return buildNewLinkedDeviceMegaphone(context);
-      case UPDATE_PIN_AFTER_AEP_REGISTRATION:
-        return buildUpdatePinAfterAepRegistrationMegaphone();
       case TURN_ON_SIGNAL_BACKUPS:
         return buildTurnOnSignalBackupsMegaphone();
       case VERIFY_BACKUP_KEY:
@@ -448,19 +445,6 @@ public final class Megaphones {
         .build();
   }
 
-  public static @NonNull Megaphone buildUpdatePinAfterAepRegistrationMegaphone() {
-    return new Megaphone.Builder(Event.UPDATE_PIN_AFTER_AEP_REGISTRATION, Megaphone.Style.BASIC)
-        .setImage(R.drawable.kbs_pin_megaphone)
-        .setTitle(R.string.UpdatePinMegaphone__update_signal_pin)
-        .setBody(R.string.UpdatePinMegaphone__message)
-        .setActionButton(R.string.UpdatePinMegaphone__update_pin, (megaphone, listener) -> {
-          Intent intent = CreateSvrPinActivity.getIntentForPinCreate(AppDependencies.getApplication());
-
-          listener.onMegaphoneNavigationRequested(intent, CreateSvrPinActivity.REQUEST_NEW_PIN);
-        })
-        .build();
-  }
-
   public static @NonNull Megaphone buildTurnOnSignalBackupsMegaphone() {
     return new Megaphone.Builder(Event.TURN_ON_SIGNAL_BACKUPS, Megaphone.Style.BASIC)
         .setImage(R.drawable.backups_megaphone_image)
@@ -624,7 +608,6 @@ public final class Megaphones {
     PNP_LAUNCH("pnp_launch"),
     GRANT_FULL_SCREEN_INTENT("grant_full_screen_intent"),
     NEW_LINKED_DEVICE("new_linked_device"),
-    UPDATE_PIN_AFTER_AEP_REGISTRATION("update_pin_after_registration"),
     TURN_ON_SIGNAL_BACKUPS("turn_on_signal_backups"),
     VERIFY_BACKUP_KEY("verify_backup_key");
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/UpdatePinAfterAepRegistrationSchedule.kt b/app/src/main/java/org/thoughtcrime/securesms/megaphone/UpdatePinAfterAepRegistrationSchedule.kt
deleted file mode 100644
index 67d894e025..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/UpdatePinAfterAepRegistrationSchedule.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-package org.thoughtcrime.securesms.megaphone
-
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import kotlin.time.Duration.Companion.days
-import kotlin.time.Duration.Companion.milliseconds
-
-/**
- * Schedule for showing an update pin megaphone after re-registering with AEP in a flow that doesn't provide the pin.
- *
- * That is at this point only manual AEP entry without remote backup restore.
- */
-class UpdatePinAfterAepRegistrationSchedule : MegaphoneSchedule {
-
-  override fun shouldDisplay(seenCount: Int, lastSeen: Long, firstVisible: Long, currentTime: Long): Boolean {
-    return !SignalStore.svr.hasPin() &&
-      !SignalStore.svr.hasOptedOut() &&
-      SignalStore.registration.isRegistrationComplete &&
-      (!SignalStore.backup.isMediaRestoreInProgress || hasBeenLongEnough())
-  }
-
-  /**
-   * Should show if it's been more than 3 days regardless of restore progress.
-   */
-  private fun hasBeenLongEnough(): Boolean {
-    val registeredAt = SignalStore.account.registeredAtTimestamp.milliseconds
-    val now = System.currentTimeMillis().milliseconds
-
-    return registeredAt.isNegative() || registeredAt > now || (registeredAt + 3.days) < now
-  }
-}