diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index cc4a39a30..a6acb0fc5 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3577,7 +3577,14 @@ typedef enum : NSUInteger {
                accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_gif")
                                  style:UIAlertActionStyleDefault
                                handler:^(UIAlertAction *action) {
-                                   [self showGIFMetadataWarning];
+                                   NSUserDefaults *userDefaults = NSUserDefaults.standardUserDefaults;
+                                   BOOL hasSeenGIFMetadataWarning = [userDefaults boolForKey:@"hasSeenGIFMetadataWarning"];
+                                   if (!hasSeenGIFMetadataWarning) {
+                                       [self showGIFMetadataWarning];
+                                       [userDefaults setBool:YES forKey:@"hasSeenGIFMetadataWarning"];
+                                   } else {
+                                       [self showGifPicker];
+                                   }
                                }];
     UIImage *gifImage = [UIImage imageNamed:@"actionsheet_gif_black"];
     OWSAssertDebug(gifImage);
diff --git a/SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift b/SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift
index 8aae3a111..ca4039e08 100644
--- a/SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift
+++ b/SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift
@@ -4,6 +4,7 @@ public enum LKUserDefaults {
     
     public enum Bool : Swift.String {
         case hasLaunchedOnce
+        case hasSeenGIFMetadataWarning
         case hasSeenOpenGroupSuggestionSheet
         case hasSeenPNModeSheet
         case hasViewedSeed