diff --git a/src/components/ICONS.jsx b/src/components/ICONS.jsx
index b77c7adf8b..56e6a72ee9 100644
--- a/src/components/ICONS.jsx
+++ b/src/components/ICONS.jsx
@@ -176,6 +176,8 @@ export const ICONS = {
   'user-x': () => import('@iconify-icons/mingcute/user-x-line'),
   minimize: () => import('@iconify-icons/mingcute/arrows-down-line'),
   celebrate: () => import('@iconify-icons/mingcute/celebrate-line'),
+  locked: () => import('@iconify-icons/mingcute/lock-fill'),
+  unlocked: () => import('@iconify-icons/mingcute/unlock-line'),
   schedule: () => import('@iconify-icons/mingcute/calendar-time-add-line'),
   day: () => import('@iconify-icons/mingcute/calendar-day-line'),
   camera: () => import('@iconify-icons/mingcute/camera-line'),
diff --git a/src/components/compose.jsx b/src/components/compose.jsx
index d4918653fb..103e3317f2 100644
--- a/src/components/compose.jsx
+++ b/src/components/compose.jsx
@@ -34,6 +34,7 @@ import emojifyText from '../utils/emojify-text';
 import getDomain from '../utils/get-domain';
 import i18nDuration from '../utils/i18n-duration';
 import isRTL from '../utils/is-rtl';
+import localPostingIconsMap from '../utils/local-posting-icons-map.js';
 import localeMatch from '../utils/locale-match';
 import localeCode2Text from '../utils/localeCode2Text';
 import mem from '../utils/mem';
@@ -271,6 +272,7 @@ function Compose({
   const spoilerTextRef = useRef();
   const [visibility, setVisibility] = useState('public');
   const [sensitive, setSensitive] = useState(false);
+  const [localOnly, setLocalOnly] = useState('federated');
   const [language, setLanguage] = useState(
     store.session.get('currentLanguage') || DEFAULT_LANG,
   );
@@ -300,7 +302,11 @@ function Compose({
 
   useEffect(() => {
     if (replyToStatus) {
-      const { spoilerText, visibility, language, sensitive } = replyToStatus;
+      const { spoilerText, visibility, language, sensitive, localOnly } =
+        replyToStatus;
+      if (showLocalOnlyButton) {
+        setLocalOnly(localOnly ? 'local-instance' : 'federated');
+      }
       if (spoilerText && spoilerTextRef.current) {
         spoilerTextRef.current.value = spoilerText;
       }
@@ -719,6 +725,13 @@ function Compose({
   const [showMentionPicker, setShowMentionPicker] = useState(false);
   const [showEmoji2Picker, setShowEmoji2Picker] = useState(false);
   const [showGIFPicker, setShowGIFPicker] = useState(false);
+  const supportsLocalPosting = supports('@gotosocial/local-posting');
+  const [localPostingLabel, setLocalPostingLabel] = useState('');
+  const [showLocalOnlyButton, setShowLocalOnlyButton] =
+    useState(supportsLocalPosting);
+  if (supportsLocalPosting) {
+    setLocalPostingLabel(localOnly ? 'Local' : 'Federated');
+  }
 
   const [autoDetectedLanguages, setAutoDetectedLanguages] = useState(null);
   const [topSupportedLanguages, restSupportedLanguages] = useMemo(() => {
@@ -1167,6 +1180,9 @@ function Compose({
                   params.in_reply_to_id = replyToStatus?.id || undefined;
                   params.scheduled_at = scheduledAt;
                 }
+                if (supports('@gotosocial/local-posting')) {
+                  params.local_only = localOnly === 'local-instance';
+                }
                 params = removeNullUndefined(params);
                 console.log('POST', params);
 
@@ -1254,6 +1270,30 @@ function Compose({
               />
               <Icon icon={`eye-${sensitive ? 'close' : 'open'}`} />
             </label>{' '}
+            {showLocalOnlyButton && (
+              <label class={`toolbar-button ${!sensitive ? 'show-field' : ''}`}>
+                <Icon
+                  icon={localPostingIconsMap[localOnly]}
+                  alt={localPostingLabel}
+                />
+                <select
+                  value={localOnly}
+                  onChange={(e) => {
+                    setLocalOnly(e.target.value);
+                    setLocalPostingLabel(localOnly ? 'Local' : 'Federated');
+                  }}
+                  disabled={uiState === 'loading' || !!editStatus}
+                  dir="auto"
+                >
+                  <option value="local-instance">
+                    <Trans>Local</Trans>
+                  </option>
+                  <option value="federated">
+                    <Trans>Federated</Trans>
+                  </option>
+                </select>
+              </label>
+            )}
             <label
               class={`toolbar-button ${
                 visibility !== 'public' && !sensitive ? 'show-field' : ''
diff --git a/src/components/status.jsx b/src/components/status.jsx
index 1568aac212..124286d3ca 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -624,6 +624,7 @@ function Status({
     // _filtered,
     // Non-Mastodon
     emojiReactions,
+    localOnly,
   } = status;
 
   const [languageAutoDetected, setLanguageAutoDetected] = useState(null);
@@ -2210,6 +2211,13 @@ function Status({
               </div>{' '}
             </>
           )}
+          {localOnly && (
+            <>
+              <div class="status-direct-badge">
+                <Trans>Local</Trans>
+              </div>{' '}
+            </>
+          )}
           {!withinContext && (
             <>
               {isThread ? (
diff --git a/src/data/features.json b/src/data/features.json
index c2b1193d80..2d15884271 100644
--- a/src/data/features.json
+++ b/src/data/features.json
@@ -2,6 +2,7 @@
   "@mastodon/edit-media-attributes": ">=4.1",
   "@mastodon/list-exclusive": ">=4.2",
   "@gotosocial/list-exclusive": ">=0.17",
+  "@gotosocial/local-posting": ">=0.17",
   "@mastodon/filtered-notifications": "~4.3 || >=4.3",
   "@mastodon/fetch-multiple-statuses": "~4.3 || >=4.3",
   "@mastodon/trending-link-posts": "~4.3 || >=4.3",
diff --git a/src/locales/en.po b/src/locales/en.po
index db5cee1637..5199bdb6b3 100644
--- a/src/locales/en.po
+++ b/src/locales/en.po
@@ -665,6 +665,7 @@ msgstr "You have unsaved changes. Discard this post?"
 #. placeholder {0}: unsupportedFiles.length
 #. placeholder {1}: unsupportedFiles[0].name
 #. placeholder {2}: lf.format( unsupportedFiles.map((f) => f.name), )
+
 #: src/components/compose.jsx:655
 msgid "{0, plural, one {File {1} is not supported.} other {Files {2} are not supported.}}"
 msgstr "{0, plural, one {File {1} is not supported.} other {Files {2} are not supported.}}"
@@ -707,6 +708,7 @@ msgid "Replying to @{0}’s post (<0>{1}</0>)"
 msgstr ""
 
 #. placeholder {0}: replyToStatus.account.acct || replyToStatus.account.username
+
 #: src/components/compose.jsx:991
 msgid "Replying to @{0}’s post"
 msgstr ""
diff --git a/src/utils/local-posting-icons-map.js b/src/utils/local-posting-icons-map.js
new file mode 100644
index 0000000000..80c7a883c0
--- /dev/null
+++ b/src/utils/local-posting-icons-map.js
@@ -0,0 +1,4 @@
+export default {
+  'local-instance': 'locked',
+  federated: 'unlocked',
+};
diff --git a/src/utils/supports.js b/src/utils/supports.js
index f1a15566b2..8e6170d9d3 100644
--- a/src/utils/supports.js
+++ b/src/utils/supports.js
@@ -26,6 +26,7 @@ const platformFeatures = {
   '@pixelfed/global-feed': containPixelfed,
   '@pleroma/local-visibility-post': containPleroma,
   '@akkoma/local-visibility-post': containAkkoma,
+  '@gotosocial/local-posting': containGTS,
 };
 
 const supportsCache = {};
@@ -44,7 +45,8 @@ function supports(feature) {
     if (supportsCache[key]) return supportsCache[key];
 
     if (platformFeatures[feature]) {
-      return (supportsCache[key] = platformFeatures[feature].test(version));
+      return (supportsCache[key] =
+        platformFeatures[feature].test(softwareName));
     }
 
     const range = features[feature];