diff --git a/ts/jobs/helpers/sendSenderKeyDistribution.ts b/ts/jobs/helpers/sendSenderKeyDistribution.ts
index 6076dabc9..c3e45fd2c 100644
--- a/ts/jobs/helpers/sendSenderKeyDistribution.ts
+++ b/ts/jobs/helpers/sendSenderKeyDistribution.ts
@@ -48,7 +48,9 @@ export async function sendSenderKeyDistribution(
   );
 
   if (!isDirectConversation(conversation.attributes)) {
-    log.info('Failing attempt to send null message to group');
+    log.info(
+      'Failing attempt to send sender key distribution message to group'
+    );
     return;
   }
 
diff --git a/ts/services/storage.ts b/ts/services/storage.ts
index a1622722c..13cdf94cd 100644
--- a/ts/services/storage.ts
+++ b/ts/services/storage.ts
@@ -43,6 +43,7 @@ import { map, filter } from '../util/iterables';
 import { ourProfileKeyService } from './ourProfileKey';
 import {
   ConversationTypes,
+  isDirectConversation,
   typeofConversation,
 } from '../util/whatTypeOfConversation';
 import { SignalService as Proto } from '../protobuf';
@@ -1204,7 +1205,10 @@ async function processManifest(
 
       // Remote might have dropped this conversation already, but our value of
       // `firstUnregisteredAt` is too high for us to drop it. Don't reupload it!
-      if (conversation.isUnregistered()) {
+      if (
+        isDirectConversation(conversation.attributes) &&
+        conversation.isUnregistered()
+      ) {
         log.info(
           `storageService.process(${version}): localKey=${missingKey} is ` +
             'unregistered and not in remote manifest'
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 3c9ea5be0..69ae00c49 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -496,7 +496,7 @@ function canComposeConversation(conversation: ConversationType): boolean {
     !isSignalConversation(conversation) &&
       !conversation.isBlocked &&
       !conversation.removalStage &&
-      !isConversationUnregistered(conversation) &&
+      (isGroupV2(conversation) || !isConversationUnregistered(conversation)) &&
       hasDisplayInfo(conversation) &&
       isTrusted(conversation)
   );
@@ -511,7 +511,8 @@ export const getAllComposableConversations = createSelector(
         !conversation.isBlocked &&
         !conversation.removalStage &&
         !conversation.isGroupV1AndDisabled &&
-        !isConversationUnregistered(conversation) &&
+        (isGroupV2(conversation) ||
+          !isConversationUnregistered(conversation)) &&
         // All conversation should have a title except in weird cases where
         // they don't, in that case we don't want to show these for Forwarding.
         conversation.titleNoDefault &&