diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/src/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
index 3b3317ad19..8cac0cef14 100644
--- a/src/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -57,8 +57,7 @@ import java.io.IOException;
 @RequiresApi(21)
 public class CameraXFragment extends Fragment implements CameraFragment {
 
-  private static final String TAG                                   = Log.tag(CameraXFragment.class);
-  private static final String HAS_DISMISSED_VIDEO_RECORDING_TOOLTIP = "camerax.fragment.has.dismissed.video.recording.tooltip";
+  private static final String TAG = Log.tag(CameraXFragment.class);
 
   private CameraXView          camera;
   private ViewGroup            controlsContainer;
@@ -283,11 +282,11 @@ public class CameraXFragment extends Fragment implements CameraFragment {
   }
 
   private boolean shouldDisplayVideoRecordingTooltip() {
-    return !TextSecurePreferences.getBooleanPreference(requireContext(), HAS_DISMISSED_VIDEO_RECORDING_TOOLTIP, false);
+    return !TextSecurePreferences.hasSeenVideoRecordingTooltip(requireContext()) && MediaConstraints.isVideoTranscodeAvailable();
   }
 
   private void neverDisplayVideoRecordingTooltipAgain() {
-    TextSecurePreferences.setBooleanPreference(requireContext(), HAS_DISMISSED_VIDEO_RECORDING_TOOLTIP, true);
+    TextSecurePreferences.setHasSeenVideoRecordingTooltip(requireContext(), true);
   }
 
   private void hideAndDisableControlsForVideoRecording(@NonNull View captureButton,
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 2843590818..9c2c690441 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -195,6 +195,8 @@ public class TextSecurePreferences {
 
   private static final String HAS_SEEN_SWIPE_TO_REPLY = "pref_has_seen_swipe_to_reply";
 
+  private static final String HAS_SEEN_VIDEO_RECORDING_TOOLTIP = "camerax.fragment.has.dismissed.video.recording.tooltip";
+
   public static boolean isScreenLockEnabled(@NonNull Context context) {
     return getBooleanPreference(context, SCREEN_LOCK, false);
   }
@@ -1158,6 +1160,14 @@ public class TextSecurePreferences {
     setBooleanPreference(context, HAS_SEEN_SWIPE_TO_REPLY, value);
   }
 
+  public static boolean hasSeenVideoRecordingTooltip(Context context) {
+    return getBooleanPreference(context, HAS_SEEN_VIDEO_RECORDING_TOOLTIP, false);
+  }
+
+  public static void setHasSeenVideoRecordingTooltip(Context context, boolean value) {
+    setBooleanPreference(context, HAS_SEEN_VIDEO_RECORDING_TOOLTIP, value);
+  }
+
   public static void setBooleanPreference(Context context, String key, boolean value) {
     PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(key, value).apply();
   }