diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 1d3a11b0e..2f51786bb 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -656,7 +656,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     PushNotificationManager pushNotificationManager =
         new PushNotificationManager(accountsManager, apnSender, fcmSender, pushNotificationScheduler);
     RedisMessageAvailabilityManager redisMessageAvailabilityManager =
-        new RedisMessageAvailabilityManager(accountsManager, pushNotificationManager, messagesCluster, clientEventExecutor, asyncOperationQueueingExecutor);
+        new RedisMessageAvailabilityManager(messagesCluster, clientEventExecutor, asyncOperationQueueingExecutor);
     RateLimiters rateLimiters = RateLimiters.create(dynamicConfigurationManager, rateLimitersCluster);
     ProvisioningManager provisioningManager = new ProvisioningManager(pubsubClient);
     IssuedReceiptsManager issuedReceiptsManager = new IssuedReceiptsManager(
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/RedisMessageAvailabilityManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/RedisMessageAvailabilityManager.java
index 3e481ca1a..8f9393da7 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/RedisMessageAvailabilityManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/RedisMessageAvailabilityManager.java
@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantPubSubClusterConnection;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClusterClient;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.util.RedisClusterUtil;
 import org.whispersystems.textsecuregcm.util.UUIDUtil;
 import org.whispersystems.textsecuregcm.util.Util;
@@ -56,8 +55,6 @@ import org.whispersystems.textsecuregcm.util.Util;
  */
 public class RedisMessageAvailabilityManager extends RedisClusterPubSubAdapter<byte[], byte[]> implements Managed {
 
-  private final AccountsManager accountsManager;
-  private final PushNotificationManager pushNotificationManager;
   private final FaultTolerantRedisClusterClient clusterClient;
   private final Executor listenerEventExecutor;
 
@@ -100,14 +97,9 @@ public class RedisMessageAvailabilityManager extends RedisClusterPubSubAdapter<b
   record AccountAndDeviceIdentifier(UUID accountIdentifier, byte deviceId) {
   }
 
-  public RedisMessageAvailabilityManager(final AccountsManager accountsManager,
-                                         final PushNotificationManager pushNotificationManager,
-                                         final FaultTolerantRedisClusterClient clusterClient,
-                                         final Executor listenerEventExecutor,
-                                         final Executor asyncOperationQueueingExecutor) {
-
-    this.accountsManager = accountsManager;
-    this.pushNotificationManager = pushNotificationManager;
+  public RedisMessageAvailabilityManager(final FaultTolerantRedisClusterClient clusterClient,
+      final Executor listenerEventExecutor,
+      final Executor asyncOperationQueueingExecutor) {
 
     this.clusterClient = clusterClient;
     this.listenerEventExecutor = listenerEventExecutor;
@@ -341,22 +333,6 @@ public class RedisMessageAvailabilityManager extends RedisClusterPubSubAdapter<b
 
       if (clientEvent.getEventCase() == ClientEvent.EventCase.NEW_MESSAGE_AVAILABLE) {
         MESSAGE_AVAILABLE_WITHOUT_LISTENER_COUNTER.increment();
-
-        // If we have an active subscription but no registered listener, it's likely that the publisher of this event
-        // believes that the receiving client was present when it really wasn't. Send a push notification as a
-        // just-in-case measure.
-        accountsManager.getByAccountIdentifierAsync(accountAndDeviceIdentifier.accountIdentifier())
-            .thenAccept(maybeAccount -> maybeAccount.ifPresent(account -> {
-              try {
-                pushNotificationManager.sendNewMessageNotification(account, accountAndDeviceIdentifier.deviceId(), true);
-              } catch (final NotPushRegisteredException ignored) {
-              }
-            }))
-            .whenComplete((ignored, throwable) -> {
-              if (throwable != null) {
-                logger.warn("Failed to send follow-up notification to {}:{}", accountAndDeviceIdentifier.accountIdentifier(), accountAndDeviceIdentifier.deviceId());
-              }
-            });
       }
     }
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
index 8611e37a1..a021eee62 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
@@ -320,7 +320,7 @@ record CommandDependencies(
             Clock.systemUTC());
 
     RedisMessageAvailabilityManager redisMessageAvailabilityManager =
-        new RedisMessageAvailabilityManager(accountsManager, pushNotificationManager, messagesCluster, clientEventExecutor, asyncOperationQueueingExecutor);
+        new RedisMessageAvailabilityManager(messagesCluster, clientEventExecutor, asyncOperationQueueingExecutor);
 
     final DynamoDbRecoveryManager dynamoDbRecoveryManager =
         new DynamoDbRecoveryManager(accounts, phoneNumberIdentifiers);
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/push/RedisMessageAvailabilityManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/push/RedisMessageAvailabilityManagerTest.java
index 8b3fc9750..a32807beb 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/push/RedisMessageAvailabilityManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/push/RedisMessageAvailabilityManagerTest.java
@@ -11,7 +11,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import io.lettuce.core.cluster.SlotHash;
@@ -20,9 +19,7 @@ import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
 import io.lettuce.core.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -38,8 +35,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClusterClient;
 import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.tests.util.MockRedisFuture;
 import org.whispersystems.textsecuregcm.tests.util.RedisClusterHelper;
@@ -79,15 +74,11 @@ class RedisMessageAvailabilityManagerTest {
 
   @BeforeEach
   void setUp() {
-    localEventManager = new RedisMessageAvailabilityManager(mock(AccountsManager.class),
-        mock(PushNotificationManager.class),
-        REDIS_CLUSTER_EXTENSION.getRedisCluster(),
+    localEventManager = new RedisMessageAvailabilityManager(REDIS_CLUSTER_EXTENSION.getRedisCluster(),
         webSocketConnectionEventExecutor,
         asyncOperationQueueingExecutor);
 
-    remoteEventManager = new RedisMessageAvailabilityManager(mock(AccountsManager.class),
-        mock(PushNotificationManager.class),
-        REDIS_CLUSTER_EXTENSION.getRedisCluster(),
+    remoteEventManager = new RedisMessageAvailabilityManager(REDIS_CLUSTER_EXTENSION.getRedisCluster(),
         webSocketConnectionEventExecutor,
         asyncOperationQueueingExecutor);
 
@@ -189,8 +180,6 @@ class RedisMessageAvailabilityManagerTest {
         .build();
 
     final RedisMessageAvailabilityManager eventManager = new RedisMessageAvailabilityManager(
-        mock(AccountsManager.class),
-        mock(PushNotificationManager.class),
         clusterClient,
         Runnable::run,
         Runnable::run);
@@ -257,8 +246,6 @@ class RedisMessageAvailabilityManagerTest {
         .build();
 
     final RedisMessageAvailabilityManager eventManager = new RedisMessageAvailabilityManager(
-        mock(AccountsManager.class),
-        mock(PushNotificationManager.class),
         clusterClient,
         Runnable::run,
         Runnable::run);
@@ -287,60 +274,4 @@ class RedisMessageAvailabilityManagerTest {
     verify(pubSubAsyncCommands)
         .sunsubscribe(RedisMessageAvailabilityManager.getClientEventChannel(noListenerAccountIdentifier, noListenerDeviceId));
   }
-
-  @Test
-  void newMessageNotificationWithoutListener() throws NotPushRegisteredException {
-    final UUID listenerAccountIdentifier = UUID.randomUUID();
-    final byte listenerDeviceId = Device.PRIMARY_ID;
-
-    final UUID noListenerAccountIdentifier = UUID.randomUUID();
-    final byte noListenerDeviceId = listenerDeviceId + 1;
-
-    final Account noListenerAccount = mock(Account.class);
-
-    final AccountsManager accountsManager = mock(AccountsManager.class);
-
-    when(accountsManager.getByAccountIdentifierAsync(noListenerAccountIdentifier))
-        .thenReturn(CompletableFuture.completedFuture(Optional.of(noListenerAccount)));
-
-    final PushNotificationManager pushNotificationManager = mock(PushNotificationManager.class);
-
-    @SuppressWarnings("unchecked") final RedisClusterPubSubAsyncCommands<byte[], byte[]> pubSubAsyncCommands =
-        mock(RedisClusterPubSubAsyncCommands.class);
-
-    when(pubSubAsyncCommands.ssubscribe(any())).thenReturn(MockRedisFuture.completedFuture(null));
-
-    final FaultTolerantRedisClusterClient clusterClient = RedisClusterHelper.builder()
-        .binaryPubSubAsyncCommands(pubSubAsyncCommands)
-        .build();
-
-    final RedisMessageAvailabilityManager eventManager = new RedisMessageAvailabilityManager(
-        accountsManager,
-        pushNotificationManager,
-        clusterClient,
-        Runnable::run,
-        Runnable::run);
-
-    eventManager.start();
-
-    eventManager.handleClientConnected(listenerAccountIdentifier, listenerDeviceId, new MessageAvailabilityAdapter())
-        .toCompletableFuture()
-        .join();
-
-    final byte[] newMessagePayload = ClientEvent.newBuilder()
-        .setNewMessageAvailable(NewMessageAvailableEvent.getDefaultInstance())
-        .build()
-        .toByteArray();
-
-    eventManager.smessage(mock(RedisClusterNode.class),
-        RedisMessageAvailabilityManager.getClientEventChannel(listenerAccountIdentifier, listenerDeviceId),
-        newMessagePayload);
-
-    eventManager.smessage(mock(RedisClusterNode.class),
-        RedisMessageAvailabilityManager.getClientEventChannel(noListenerAccountIdentifier, noListenerDeviceId),
-        newMessagePayload);
-
-    verify(pushNotificationManager).sendNewMessageNotification(noListenerAccount, noListenerDeviceId, true);
-    verifyNoMoreInteractions(pushNotificationManager);
-  }
 }
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagePersisterIntegrationTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagePersisterIntegrationTest.java
index 0754c8596..cd0cb74a9 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagePersisterIntegrationTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagePersisterIntegrationTest.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
 import org.whispersystems.textsecuregcm.entities.MessageProtos;
-import org.whispersystems.textsecuregcm.push.PushNotificationManager;
 import org.whispersystems.textsecuregcm.push.MessageAvailabilityListener;
 import org.whispersystems.textsecuregcm.push.RedisMessageAvailabilityManager;
 import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
@@ -88,9 +87,7 @@ class MessagePersisterIntegrationTest {
 
     websocketConnectionEventExecutor = Executors.newVirtualThreadPerTaskExecutor();
     asyncOperationQueueingExecutor = Executors.newSingleThreadExecutor();
-    redisMessageAvailabilityManager = new RedisMessageAvailabilityManager(mock(AccountsManager.class),
-        mock(PushNotificationManager.class),
-        REDIS_CLUSTER_EXTENSION.getRedisCluster(),
+    redisMessageAvailabilityManager = new RedisMessageAvailabilityManager(REDIS_CLUSTER_EXTENSION.getRedisCluster(),
         websocketConnectionEventExecutor,
         asyncOperationQueueingExecutor);