diff --git a/src/org/thoughtcrime/securesms/dependencies/TextSecureCommunicationModule.java b/src/org/thoughtcrime/securesms/dependencies/TextSecureCommunicationModule.java
index 7845aea745..d5c3b902a9 100644
--- a/src/org/thoughtcrime/securesms/dependencies/TextSecureCommunicationModule.java
+++ b/src/org/thoughtcrime/securesms/dependencies/TextSecureCommunicationModule.java
@@ -66,8 +66,7 @@ public class TextSecureCommunicationModule {
                                            TextSecurePreferences.getLocalNumber(context),
                                            TextSecurePreferences.getPushServerPassword(context),
                                            new TextSecureAxolotlStore(context),
-                                           Optional.of((TextSecureMessageSender.EventListener)
-                                                           new SecurityEventListener(context)));
+                                           Optional.<TextSecureMessageSender.EventListener>of(new SecurityEventListener(context)));
       }
     };
   }