diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
index 9beead1d31..94cf60f51e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
@@ -166,11 +166,9 @@ class ConversationSettingsFragment :
 
   private val viewModel by viewModels<ConversationSettingsViewModel>(
     factoryProducer = {
-      val groupId = args.groupId as? GroupId
-
       ConversationSettingsViewModel.Factory(
         recipientId = args.recipientId,
-        groupId = groupId,
+        groupId = args.groupId,
         callMessageIds = args.callMessageIds ?: longArrayOf(),
         repository = ConversationSettingsRepository(requireContext()),
         messageRequestRepository = MessageRequestRepository(requireContext())
@@ -253,9 +251,7 @@ class ConversationSettingsFragment :
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     return if (item.itemId == R.id.action_edit) {
       val args = ConversationSettingsFragmentArgs.fromBundle(requireArguments())
-      val groupId = args.groupId as GroupId
-
-      startActivity(CreateProfileActivity.getIntentForGroupProfile(requireActivity(), requireNotNull(groupId)))
+      startActivity(CreateProfileActivity.getIntentForGroupProfile(requireActivity(), requireNotNull(args.groupId)))
       true
     } else {
       super.onOptionsItemSelected(item)
@@ -914,7 +910,7 @@ class ConversationSettingsFragment :
             icon = DSLSettingsIcon.from(R.drawable.ic_link_16),
             isEnabled = state.recipient.isActiveGroup && !state.isDeprecatedOrUnregistered,
             onClick = {
-              navController.safeNavigate(ConversationSettingsFragmentDirections.actionConversationSettingsFragmentToShareableGroupLinkFragment(groupState.groupId.requireV2().toString()))
+              navController.safeNavigate(ConversationSettingsFragmentDirections.actionConversationSettingsFragmentToShareableGroupLinkFragment(groupState.groupId))
             }
           )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsFragment.kt
index 44ac321c83..52f4796253 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsFragment.kt
@@ -9,7 +9,6 @@ import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.ui.GroupErrors
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 
@@ -24,10 +23,8 @@ class PermissionsSettingsFragment : DSLSettingsFragment(
   private val viewModel: PermissionsSettingsViewModel by viewModels(
     factoryProducer = {
       val args = PermissionsSettingsFragmentArgs.fromBundle(requireArguments())
-      val groupId = requireNotNull(args.groupId as GroupId)
       val repository = PermissionsSettingsRepository(requireContext())
-
-      PermissionsSettingsViewModel.Factory(groupId, repository)
+      PermissionsSettingsViewModel.Factory(args.groupId, repository)
     }
   )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkFragment.kt
index 7b124bc6fe..d38a27c537 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkFragment.kt
@@ -26,7 +26,7 @@ class ShareableGroupLinkFragment : DSLSettingsFragment(
   private var busyDialog: SimpleProgressDialog.DismissibleDialog? = null
 
   private val groupId: GroupId.V2
-    get() = GroupId.parseOrThrow(ShareableGroupLinkFragmentArgs.fromBundle(requireArguments()).groupId).requireV2()
+    get() = ShareableGroupLinkFragmentArgs.fromBundle(requireArguments()).groupId.requireV2()
 
   private val viewModel: ShareableGroupLinkViewModel by viewModels(
     factoryProducer = {
diff --git a/app/src/main/res/navigation/conversation_settings.xml b/app/src/main/res/navigation/conversation_settings.xml
index 6fa3016a59..f13d5846f5 100644
--- a/app/src/main/res/navigation/conversation_settings.xml
+++ b/app/src/main/res/navigation/conversation_settings.xml
@@ -44,7 +44,7 @@
 
         <argument
             android:name="group_id"
-            app:argType="android.os.Parcelable"
+            app:argType="org.thoughtcrime.securesms.groups.GroupId"
             app:nullable="true" />
 
         <argument
@@ -90,7 +90,7 @@
 
             <argument
                 android:name="group_id"
-                app:argType="android.os.Parcelable"
+                app:argType="org.thoughtcrime.securesms.groups.GroupId"
                 app:nullable="true" />
         </action>
 
@@ -126,7 +126,7 @@
 
             <argument
                 android:name="group_id"
-                app:argType="android.os.Parcelable"
+                app:argType="org.thoughtcrime.securesms.groups.GroupId"
                 app:nullable="false" />
         </action>
 
@@ -185,8 +185,8 @@
 
         <argument
             android:name="group_id"
-            app:argType="android.os.Parcelable"
-            app:nullable="true" />
+            app:argType="org.thoughtcrime.securesms.groups.GroupId"
+            app:nullable="false" />
     </fragment>
 
     <fragment
@@ -205,7 +205,8 @@
 
         <argument
             android:name="group_id"
-            app:argType="string" />
+            app:argType="org.thoughtcrime.securesms.groups.GroupId"
+            app:nullable="false" />
 
     </fragment>
 
@@ -215,7 +216,7 @@
 
         <argument
             android:name="group_id"
-            app:argType="android.os.Parcelable"
+            app:argType="org.thoughtcrime.securesms.groups.GroupId"
             app:nullable="false" />
     </fragment>