diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
index c88486fc2f..8b3549f296 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
@@ -160,7 +160,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         title = DSLSettingsText.from(R.string.preferences__linked_devices),
         icon = DSLSettingsIcon.from(R.drawable.symbol_devices_24),
         onClick = {
-          if (FeatureFlags.linkedDevicesV2()) {
+          if (FeatureFlags.internalUser()) {
             findNavController().safeNavigate(R.id.action_appSettingsFragment_to_linkDeviceFragment)
           } else {
             findNavController().safeNavigate(R.id.action_appSettingsFragment_to_deviceActivity)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
index ddf6c8b5fb..0b5dade597 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
@@ -94,7 +94,7 @@ class MediaCaptureFragment : Fragment(R.layout.fragment_container), CameraFragme
             .setTitle(R.string.MediaCaptureFragment_device_link_dialog_title)
             .setMessage(R.string.MediaCaptureFragment_device_link_dialog_body)
             .setPositiveButton(R.string.MediaCaptureFragment_device_link_dialog_continue) { d, _ ->
-              if (FeatureFlags.linkedDevicesV2()) {
+              if (FeatureFlags.internalUser()) {
                 startActivity(AppSettingsActivity.linkedDevices(requireContext()))
               } else {
                 startActivity(DeviceActivity.getIntentForScanner(requireContext()))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.kt b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.kt
index 01fea8b50e..04ac274c3b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.kt
@@ -125,7 +125,6 @@ object FeatureFlags {
   private const val RESTORE_POST_REGISTRATION = "android.registration.restorePostRegistration"
   private const val LIBSIGNAL_WEB_SOCKET_SHADOW_PCT = "android.libsignalWebSocketShadowingPercentage"
   private const val DELETE_SYNC_SEND_RECEIVE = "android.deleteSyncSendReceive"
-  private const val LINKED_DEVICES_V2 = "android.linkedDevices.v2"
   private const val SVR3_MIGRATION_PHASE = "global.svr3.phase"
 
   /**
@@ -212,7 +211,7 @@ object FeatureFlags {
 
   @JvmField
   @VisibleForTesting
-  val NOT_REMOTE_CAPABLE: Set<String> = SetUtil.newHashSet(MESSAGE_BACKUPS, REGISTRATION_V2, RESTORE_POST_REGISTRATION, LINKED_DEVICES_V2)
+  val NOT_REMOTE_CAPABLE: Set<String> = SetUtil.newHashSet(MESSAGE_BACKUPS, REGISTRATION_V2, RESTORE_POST_REGISTRATION)
 
   /**
    * Values in this map will take precedence over any value. This should only be used for local
@@ -810,11 +809,6 @@ object FeatureFlags {
     return getBoolean(DELETE_SYNC_SEND_RECEIVE, false)
   }
 
-  /** Whether or not to use V2 of linked devices.  */
-  fun linkedDevicesV2(): Boolean {
-    return getBoolean(LINKED_DEVICES_V2, false)
-  }
-
   /** Which phase we're in for the SVR3 migration  */
   fun svr3MigrationPhase(): Int {
     return getInteger(SVR3_MIGRATION_PHASE, 0)