diff --git a/app/soapbox/features/ui/util/optional_motion.js b/app/soapbox/features/ui/util/optional_motion.js
deleted file mode 100644
index c9a17f39ea..0000000000
Binary files a/app/soapbox/features/ui/util/optional_motion.js and /dev/null differ
diff --git a/app/soapbox/features/ui/util/optional_motion.tsx b/app/soapbox/features/ui/util/optional_motion.tsx
new file mode 100644
index 0000000000..15c0d0cd13
--- /dev/null
+++ b/app/soapbox/features/ui/util/optional_motion.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { Motion, MotionProps } from 'react-motion';
+
+import { useSettings } from 'soapbox/hooks';
+
+import ReducedMotion from './reduced_motion';
+
+const OptionalMotion = (props: MotionProps) => {
+  const reduceMotion = useSettings().get('reduceMotion');
+
+  return (
+    reduceMotion ? <ReducedMotion {...props} /> : <Motion {...props} />
+  );
+};
+
+export default OptionalMotion;
diff --git a/app/soapbox/features/ui/util/reduced_motion.js b/app/soapbox/features/ui/util/reduced_motion.js
deleted file mode 100644
index 62d36f6262..0000000000
Binary files a/app/soapbox/features/ui/util/reduced_motion.js and /dev/null differ
diff --git a/app/soapbox/features/ui/util/reduced_motion.tsx b/app/soapbox/features/ui/util/reduced_motion.tsx
new file mode 100644
index 0000000000..c677f4428c
--- /dev/null
+++ b/app/soapbox/features/ui/util/reduced_motion.tsx
@@ -0,0 +1,31 @@
+// Like react-motion's Motion, but reduces all animations to cross-fades
+// for the benefit of users with motion sickness.
+import React from 'react';
+import { Motion, MotionProps } from 'react-motion';
+
+const stylesToKeep = ['opacity', 'backgroundOpacity'];
+
+const extractValue = (value: any) => {
+  // This is either an object with a "val" property or it's a number
+  return (typeof value === 'object' && value && 'val' in value) ? value.val : value;
+};
+
+const ReducedMotion: React.FC<MotionProps> = ({ style = {}, defaultStyle = {}, children }) => {
+
+  Object.keys(style).forEach(key => {
+    if (stylesToKeep.includes(key)) {
+      return;
+    }
+    // If it's setting an x or height or scale or some other value, we need
+    // to preserve the end-state value without actually animating it
+    style[key] = defaultStyle[key] = extractValue(style[key]);
+  });
+
+  return (
+    <Motion style={style} defaultStyle={defaultStyle}>
+      {children}
+    </Motion>
+  );
+};
+
+export default ReducedMotion;