diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java
index 982b1a5249..65bf4b2c7a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java
@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
 
 import org.signal.core.util.AsciiArt;
 import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
 /**
  * Renders data pertaining to sender key. While all private info is obfuscated, this is still only intended to be printed for internal users.
@@ -23,8 +24,12 @@ public class LogSectionSenderKey implements LogSection {
     StringBuilder builder = new StringBuilder();
 
     builder.append("--- Sender Keys Created By This Device").append("\n\n");
-    try (Cursor cursor = SignalDatabase.senderKeys().getAllCreatedBySelf()) {
-      builder.append(AsciiArt.tableFor(cursor)).append("\n\n");
+    if (SignalStore.account().getAci() != null){
+      try (Cursor cursor = SignalDatabase.senderKeys().getAllCreatedBySelf()) {
+        builder.append(AsciiArt.tableFor(cursor)).append("\n\n");
+      }
+    } else {
+      builder.append("<no ACI assigned yet>").append("\n\n");
     }
 
     builder.append("--- Sender Key Shared State").append("\n\n");