diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
index ab4a94ce6a..ecba0d52f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
@@ -42,6 +42,10 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
    * Most callers should use {@link #isPhoneNumberSharingEnabled()}.
    */
   public @NonNull PhoneNumberSharingMode getPhoneNumberSharingMode() {
+    if (SignalStore.account().isPhoneNumberless()) {
+      return PhoneNumberSharingMode.NOBODY;
+    }
+
     return PhoneNumberSharingMode.deserialize(getInteger(SHARING_MODE, PhoneNumberSharingMode.DEFAULT.serialize()));
   }
 
@@ -58,6 +62,10 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
   }
 
   public @NonNull PhoneNumberDiscoverabilityMode getPhoneNumberDiscoverabilityMode() {
+    if (SignalStore.account().isPhoneNumberless()) {
+      return PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE;
+    }
+
     // The default for existing users is to be discoverable, but new users are set to UNDECIDED in onFirstEverAppLaunch
     return PhoneNumberDiscoverabilityMode.deserialize(getInteger(DISCOVERABILITY_MODE, PhoneNumberDiscoverabilityMode.DISCOVERABLE.serialize()));
   }
diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/WindowInsetsExtensions.kt b/core/ui/src/main/java/org/signal/core/ui/compose/WindowInsetsExtensions.kt
index 17f3340f18..36058f9505 100644
--- a/core/ui/src/main/java/org/signal/core/ui/compose/WindowInsetsExtensions.kt
+++ b/core/ui/src/main/java/org/signal/core/ui/compose/WindowInsetsExtensions.kt
@@ -151,7 +151,7 @@ private fun measureSystemBars(view: View): Insets {
  * the fallback reads would be space it invents.
  */
 private fun View.isInMultiWindowMode(): Boolean {
-  if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+  if (Build.VERSION.SDK_INT < 24) {
     return false
   }