diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
index d07a2611b5..446a19c10d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
@@ -73,7 +73,7 @@ public class GroupCallUpdateSendJob extends BaseJob {
   }
 
   private GroupCallUpdateSendJob(@NonNull RecipientId recipientId,
-                                 @NonNull String eraId,
+                                 @Nullable String eraId,
                                  @NonNull List<RecipientId> recipients,
                                  int initialRecipientCount,
                                  @NonNull Parameters parameters)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
index 75d1a3c9ae..fcb778a37c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
@@ -361,7 +361,7 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
           }
         });
       } catch (IOException | VerificationFailedException | CallException e) {
-        Log.e(TAG, "error peeking from active conversation", e);
+        Log.i(TAG, "error peeking from active conversation", e);
       }
     });
   }
@@ -389,7 +389,7 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
                                   members,
                                   peekInfo -> receivedGroupCallPeekForRingingCheck(info, peekInfo));
       } catch (IOException | VerificationFailedException | CallException e) {
-        Log.e(TAG, "error peeking for ringing check", e);
+        Log.i(TAG, "error peeking for ringing check", e);
       }
     });
   }
diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
index 71b8af7da0..d353ec8f29 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
@@ -1034,7 +1034,12 @@ public class SignalServiceMessageSender {
     }
 
     if (message.getGroupCallUpdate().isPresent()) {
-      builder.setGroupCallUpdate(DataMessage.GroupCallUpdate.newBuilder().setEraId(message.getGroupCallUpdate().get().getEraId()));
+      String eraId = message.getGroupCallUpdate().get().getEraId();
+      if (eraId != null) {
+        builder.setGroupCallUpdate(DataMessage.GroupCallUpdate.newBuilder().setEraId(eraId));
+      } else {
+        builder.setGroupCallUpdate(DataMessage.GroupCallUpdate.getDefaultInstance());
+      }
     }
 
     if (message.getPayment().isPresent()) {