diff --git a/src/app/components/message/MsgTypeRenderers.tsx b/src/app/components/message/MsgTypeRenderers.tsx
index 379068c31..dd2c894a0 100644
--- a/src/app/components/message/MsgTypeRenderers.tsx
+++ b/src/app/components/message/MsgTypeRenderers.tsx
@@ -15,6 +15,7 @@ import {
   MessageVerificationRequestContent,
 } from './content';
 import { useMessageTranslation } from '../../hooks/useMessageTranslation';
+import { useReducedMotion } from '../../hooks/useReducedMotion';
 import { languageName } from '../../utils/translation/langUtils';
 import {
   IAudioContent,
@@ -62,8 +63,9 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
     return () => observer.disconnect();
   }, []);
 
-  const prefersReducedMotion =
-    typeof window !== 'undefined' && window.matchMedia('(prefers-reduced-motion: reduce)').matches;
+  // A one-time matchMedia() read never updated if the OS setting changed mid-session
+  // (Gitea #85); useReducedMotion subscribes to the change event instead.
+  const prefersReducedMotion = useReducedMotion();
 
   return (
     <div>
@@ -633,6 +635,13 @@ type MLocationProps = {
 };
 export function MLocation({ content }: MLocationProps) {
   const { t } = useTranslation();
+  // The OpenStreetMap iframe used to mount unconditionally on render, silently
+  // handing the sender's coordinates (and this client's IP/UA) to
+  // openstreetmap.org for every location message rendered, autoplay or not.
+  // Gate it behind an explicit click instead (Gitea #66). There's no
+  // location-specific auto-load setting in settings.ts to opt back into this,
+  // so it always requires a click.
+  const [mapLoaded, setMapLoaded] = useState(false);
   // Prefer the legacy top-level geo_uri, but fall back to the MSC3488 extensible
   // location block so events from clients that only send the new shape (uri under
   // org.matrix.msc3488.location / m.location) still render instead of appearing
@@ -660,20 +669,33 @@ export function MLocation({ content }: MLocationProps) {
 
   return (
     <Box direction="Column" alignItems="Start" gap="200">
-      <iframe
-        title="Location"
-        src={mapSrc}
-        style={{
-          width: '280px',
-          height: '160px',
-          border: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`,
-          borderRadius: '8px',
-          display: 'block',
-        }}
-        scrolling="no"
-        loading="lazy"
-        sandbox="allow-scripts"
-      />
+      {mapLoaded ? (
+        <iframe
+          title="Location"
+          src={mapSrc}
+          style={{
+            width: '280px',
+            height: '160px',
+            border: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`,
+            borderRadius: '8px',
+            display: 'block',
+          }}
+          scrolling="no"
+          loading="lazy"
+          sandbox="allow-scripts"
+        />
+      ) : (
+        <Button
+          size="400"
+          radii="300"
+          variant="Secondary"
+          fill="Soft"
+          onClick={() => setMapLoaded(true)}
+          before={<Icon src={Icons.Pin} size="50" />}
+        >
+          <Text size="B300">{t('Organisms.Message.load_map', 'Load map')}</Text>
+        </Button>
+      )}
       {description && (
         <Text size="T300" style={{ wordBreak: 'break-word', maxWidth: '280px' }}>
           {description}