diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index c1fe16fcd8..90a3834d2f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.attachments
 import android.content.Context
 import com.google.protobuf.ByteString
 import org.session.libsession.database.MessageDataProvider
-import org.session.libsession.database.dto.AttachmentState
+import org.session.libsession.messaging.sending_receiving.attachments.AttachmentState
 import org.session.libsession.messaging.sending_receiving.attachments.SessionServiceAttachmentPointer
 import org.session.libsession.messaging.sending_receiving.attachments.SessionServiceAttachmentStream
 import org.session.libsignal.libsignal.util.guava.Optional
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt
index 800bbed060..8b91c0f541 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt
@@ -12,7 +12,7 @@ abstract class SessionServiceAttachment protected constructor(val contentType: S
     var isImage: Boolean = false
     var isVideo: Boolean = false
     var isAudio: Boolean = false
-    var url: String? = null
+    var url: String = ""
     var key: ByteString? = null
 
     abstract fun isStream(): Boolean