diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index c25d157bb3..ce06e86c1a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -3,10 +3,7 @@ package org.thoughtcrime.securesms.conversation.v2
 import android.Manifest
 import android.animation.FloatEvaluator
 import android.animation.ValueAnimator
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.content.res.Resources
 import android.database.Cursor
 import android.graphics.Rect
@@ -972,7 +969,23 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     private fun showGIFPicker() {
-        AttachmentManager.selectGif(this, ConversationActivityV2.PICK_GIF)
+        val hasSeenGIFMetaDataWarning: Boolean = TextSecurePreferences.hasSeenGIFMetaDataWarning(this)
+        if (!hasSeenGIFMetaDataWarning) {
+            val builder = AlertDialog.Builder(this)
+            builder.setTitle("Search GIFs?")
+            builder.setMessage("You will not have full metadata protection when sending GIFs.")
+            builder.setPositiveButton("OK") { dialog: DialogInterface, which: Int ->
+                AttachmentManager.selectGif(this, ConversationActivityV2.PICK_GIF)
+                dialog.dismiss()
+            }
+            builder.setNegativeButton(
+                "Cancel"
+            ) { dialog: DialogInterface, which: Int -> dialog.dismiss() }
+            builder.create().show()
+            TextSecurePreferences.setHasSeenGIFMetaDataWarning(this)
+        } else {
+            AttachmentManager.selectGif(this, ConversationActivityV2.PICK_GIF)
+        }
     }
 
     private fun showDocumentPicker() {
diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
index 7ac0feae6d..ab9bdcc08f 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
@@ -285,6 +285,16 @@ object TextSecurePreferences {
         setBooleanPreference(context, LINK_PREVIEWS, enabled)
     }
 
+    @JvmStatic
+    fun hasSeenGIFMetaDataWarning(context: Context): Boolean {
+        return getBooleanPreference(context, "has_seen_gif_metadata_warning", false)
+    }
+
+    @JvmStatic
+    fun setHasSeenGIFMetaDataWarning(context: Context) {
+        setBooleanPreference(context, "has_seen_gif_metadata_warning", true)
+    }
+
     @JvmStatic
     fun isGifSearchInGridLayout(context: Context): Boolean {
         return getBooleanPreference(context, GIF_GRID_LAYOUT, false)