diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
index 10d48c8f96..6d6255e788 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
@@ -123,7 +123,10 @@ class LinkDeviceActivity : BaseActionBarActivity(), ScanQRCodeWrapperFragmentDel
                 // show a dialog or something saying do you want to skip this bit?
             }
             // start polling and wait for updated message
-            ApplicationContext.getInstance(this@LinkDeviceActivity).startPollingIfNeeded()
+            ApplicationContext.getInstance(this@LinkDeviceActivity).apply {
+                setUpStorageAPIIfNeeded()
+                startPollingIfNeeded()
+            }
             TextSecurePreferences.events.filter { it == TextSecurePreferences.CONFIGURATION_SYNCED }.collect {
                 // handle we've synced
                 snackBar.dismiss()