diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 9825afd0f6..112523b86c 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -320,15 +320,17 @@ public class MessageNotifier {
     long timestamp = notifications.get(0).getTimestamp();
     if (timestamp != 0) builder.setWhen(timestamp);
 
-    ReplyMethod replyMethod = ReplyMethod.forRecipient(context, recipient);
+    if (!KeyCachingService.isLocked(context)) {
+      ReplyMethod replyMethod = ReplyMethod.forRecipient(context, recipient);
 
-    builder.addActions(notificationState.getMarkAsReadIntent(context, notificationId),
-                       notificationState.getQuickReplyIntent(context, notifications.get(0).getRecipient()),
-                       notificationState.getRemoteReplyIntent(context, notifications.get(0).getRecipient(), replyMethod),
-                       replyMethod);
+      builder.addActions(notificationState.getMarkAsReadIntent(context, notificationId),
+                         notificationState.getQuickReplyIntent(context, notifications.get(0).getRecipient()),
+                         notificationState.getRemoteReplyIntent(context, notifications.get(0).getRecipient(), replyMethod),
+                         replyMethod);
 
-    builder.addAndroidAutoAction(notificationState.getAndroidAutoReplyIntent(context, notifications.get(0).getRecipient()),
-                                 notificationState.getAndroidAutoHeardIntent(context, notificationId), notifications.get(0).getTimestamp());
+      builder.addAndroidAutoAction(notificationState.getAndroidAutoReplyIntent(context, notifications.get(0).getRecipient()),
+                                   notificationState.getAndroidAutoHeardIntent(context, notificationId), notifications.get(0).getTimestamp());
+    }
 
     ListIterator<NotificationItem> iterator = notifications.listIterator(notifications.size());