diff --git a/res/layout/activity_seed.xml b/res/layout/activity_seed.xml
index 30e7062e11..cd79c01125 100644
--- a/res/layout/activity_seed.xml
+++ b/res/layout/activity_seed.xml
@@ -123,7 +123,8 @@
             android:layout_height="50dp"
             android:background="@color/transparent"
             android:textColor="@color/signal_primary"
-            android:text="@string/activity_key_pair_toggle_mode_button_title_3"
+            android:text="Link Device (Coming Soon)"
+            android:alpha="0.24"
             android:elevation="0dp"
             android:stateListAnimator="@null" />
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 21598d3421..666ee32098 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -42,7 +42,7 @@
                 android:icon="@drawable/icon_qr_code"/>
 
     <Preference android:key="preference_category_link_device"
-                android:title="@string/activity_settings_link_device_button_title"
+                android:title="Link Device (Coming Soon)"
                 android:icon="@drawable/icon_link"/>
 
     <Preference android:key="preference_category_seed"
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index f9b4cd3b15..840029356e 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -187,10 +187,14 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_PUBLIC_KEY));
       this.findPreference(PREFERENCE_CATEGORY_QR_CODE)
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_QR_CODE));
+
+      // TODO: Enable this again later
+      /*
       Preference linkDevicePreference = this.findPreference(PREFERENCE_CATEGORY_LINK_DEVICE);
       // Hide if this is a slave device
       linkDevicePreference.setVisible(isMasterDevice);
       linkDevicePreference.setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_LINK_DEVICE));
+       */
       Preference seedPreference = this.findPreference(PREFERENCE_CATEGORY_SEED);
       // Hide if this is a slave device
       seedPreference.setVisible(isMasterDevice);
diff --git a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
index a98b6c5a46..33dd27e62c 100644
--- a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
@@ -54,7 +54,8 @@ class SeedActivity : BaseActionBarActivity(), DeviceLinkingDialogDelegate {
         copyButton.setOnClickListener { copy() }
         toggleRegisterModeButton.setOnClickListener { mode = Mode.Register }
         toggleRestoreModeButton.setOnClickListener { mode = Mode.Restore }
-        toggleLinkModeButton.setOnClickListener { mode = Mode.Link }
+        // TODO: Enable this again later
+//        toggleLinkModeButton.setOnClickListener { mode = Mode.Link }
         mainButton.setOnClickListener { handleMainButtonTapped() }
         Analytics.shared.track("Seed Screen Viewed")
     }