diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
index 08c3ab1354..74039413ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -193,7 +193,11 @@ public class Recipient {
 
         return resolved(id);
       } else {
-        throw new UuidRecipientError();
+        if (!FeatureFlags.uuids() && FeatureFlags.groupsV2()) {
+          throw new RuntimeException(new UuidRecipientError());
+        } else {
+          throw new UuidRecipientError();
+        }
       }
     } else if (e164 != null) {
       Recipient recipient = resolved(db.getOrInsertFromE164(e164));
@@ -272,7 +276,11 @@ public class Recipient {
         if (possibleId.isPresent()) {
           id = possibleId.get();
         } else {
-          throw new UuidRecipientError();
+          if (!FeatureFlags.uuids() && FeatureFlags.groupsV2()) {
+            throw new RuntimeException(new UuidRecipientError());
+          } else {
+            throw new UuidRecipientError();
+          }
         }
       }
     } else if (GroupId.isEncodedGroup(identifier)) {