diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt
index 00aba08457..9aef0296ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt
@@ -40,7 +40,7 @@ class LinkPreviewViewModelV2(
   private val linkPreviewStateStore = RxStore(savedLinkPreviewState)
 
   val linkPreviewState: Flowable<LinkPreviewState> = linkPreviewStateStore.stateFlowable.observeOn(AndroidSchedulers.mainThread())
-  val linkPreviewStateSnapshot: LinkPreviewState = linkPreviewStateStore.state
+  val linkPreviewStateSnapshot: LinkPreviewState get() = linkPreviewStateStore.state
 
   val hasLinkPreview: Boolean = linkPreviewStateStore.state.linkPreview.isPresent
   val hasLinkPreviewUi: Boolean = linkPreviewStateStore.state.hasContent()
@@ -166,7 +166,7 @@ class LinkPreviewViewModelV2(
       }
   }
 
-  fun setLinkPreviewState(linkPreviewState: LinkPreviewState) {
+  private fun setLinkPreviewState(linkPreviewState: LinkPreviewState) {
     linkPreviewStateStore.update { cleanseState(linkPreviewState) }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationFragment.kt
index fb28444fb9..2d77d87000 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationFragment.kt
@@ -33,7 +33,6 @@ import org.thoughtcrime.securesms.mediasend.v2.text.send.TextStoryPostSendResult
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.activitySavedStateViewModel
-import org.thoughtcrime.securesms.util.viewModel
 import org.thoughtcrime.securesms.util.visible
 import java.util.Optional
 
@@ -248,7 +247,7 @@ class TextStoryPostCreationFragment : Fragment(R.layout.stories_text_post_creati
     return if (linkPreviewState.linkPreview.isPresent) {
       linkPreviewState.linkPreview.get()
     } else if (!linkPreviewState.activeUrlForError.isNullOrEmpty()) {
-      LinkPreview(linkPreviewState.activeUrlForError!!, linkPreviewState.activeUrlForError!!, "", 0L, Optional.empty())
+      LinkPreview(linkPreviewState.activeUrlForError, linkPreviewState.activeUrlForError, "", 0L, Optional.empty())
     } else {
       null
     }