diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
index 3a08336ef..1781bba41 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
@@ -153,7 +153,7 @@ public class LogSectionSystemInfo implements LogSection {
   }
 
   private static String getSigningString(@NonNull Context context) {
-    return AppSignatureUtil.getAppSignature(context).orElse("Unknown");
+    return AppSignatureUtil.getAppSignature(context);
   }
 
   private static String getPlayServicesString(@NonNull Context context) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AppSignatureUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AppSignatureUtil.java
index d3aeade66..2c0b949cc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AppSignatureUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AppSignatureUtil.java
@@ -14,7 +14,6 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
-import java.util.Optional;
 
 public final class AppSignatureUtil {
 
@@ -30,7 +29,8 @@ public final class AppSignatureUtil {
    * Only intended to be used for logging.
    */
   @SuppressLint("PackageManagerGetSignatures")
-  public static Optional<String> getAppSignature(@NonNull Context context) {
+  public static @NonNull String getAppSignature(@NonNull Context context) {
+    String hash = null;
     try {
       String         packageName    = context.getPackageName();
       PackageManager packageManager = context.getPackageManager();
@@ -38,14 +38,13 @@ public final class AppSignatureUtil {
       Signature[]    signatures     = packageInfo.signatures;
 
       if (signatures.length > 0) {
-        String hash = hash(packageName, signatures[0].toCharsString());
-        return Optional.ofNullable(hash);
+        hash = hash(packageName, signatures[0].toCharsString());
       }
     } catch (PackageManager.NameNotFoundException e) {
       Log.w(TAG, e);
     }
 
-    return Optional.empty();
+    return hash != null ? hash : "Unknown";
   }
 
   private static String hash(String packageName, String signature) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
index 9d6f63183..11652ba28 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
@@ -83,7 +83,7 @@ public final class SupportEmailUtil {
   }
 
   private static CharSequence getSignalPackage(@NonNull Context context) {
-    return String.format("%s (%s)", BuildConfig.APPLICATION_ID, AppSignatureUtil.getAppSignature(context).orElse("Unknown"));
+    return String.format("%s (%s)", BuildConfig.APPLICATION_ID, AppSignatureUtil.getAppSignature(context));
   }
 
   private static CharSequence getRegistrationLockEnabled(@NonNull Context context) {
diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt b/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
index 3298e0363..d7f730020 100644
--- a/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
+++ b/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
@@ -43,7 +43,7 @@ class SpinnerApplicationContext : ApplicationContext() {
       this,
       mapOf(
         "Device" to "${Build.MODEL} (Android ${Build.VERSION.RELEASE}, API ${Build.VERSION.SDK_INT})",
-        "Package" to "$packageName (${AppSignatureUtil.getAppSignature(this).orElse("Unknown")})",
+        "Package" to "$packageName (${AppSignatureUtil.getAppSignature(this)})",
         "App Version" to "${BuildConfig.VERSION_NAME} (${BuildConfig.CANONICAL_VERSION_CODE}, ${BuildConfig.GIT_HASH})",
         "Profile Name" to (if (SignalStore.account().isRegistered) Recipient.self().profileName.toString() else "none"),
         "E164" to (SignalStore.account().e164 ?: "none"),