diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
index 9e563e7061..1c6b7ae81f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
@@ -184,12 +184,6 @@ public class ApplicationDependencies {
   }
 
   public static @NonNull SignalServiceMessageReceiver getSignalServiceMessageReceiver() {
-    SignalServiceMessageReceiver local = messageReceiver;
-
-    if (local != null) {
-      return local;
-    }
-
     synchronized (LOCK) {
       if (messageReceiver == null) {
         messageReceiver = provider.provideSignalServiceMessageReceiver();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java
index 0b630e26bd..cec20c3b39 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java
@@ -48,8 +48,8 @@ public class IncomingMessageObserver {
 
   private static final AtomicInteger INSTANCE_COUNT = new AtomicInteger(0);
 
-  private static SignalServiceMessagePipe pipe             = null;
-  private static SignalServiceMessagePipe unidentifiedPipe = null;
+  private static volatile SignalServiceMessagePipe pipe             = null;
+  private static volatile SignalServiceMessagePipe unidentifiedPipe = null;
 
   private final Application                context;
   private final SignalServiceNetworkAccess networkAccess;