diff --git a/hugo.toml b/hugo.toml
index d05bcfbc17a647aeb89dd99f6432cfcbb8e4ba97..ff0832a71938f96dfd00bce68a635396032b69d8 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -29,3 +29,5 @@ repoUrl="https://git.qoto.org/flear"
 siteRepoUrl="https://git.qoto.org/flear/flear-site"
 siteEmail="flear@flear.org"
 postHashtags=["HamRadio", "AmateurRadio", "Ham", "RF", "ElectricalEngineering", "EE"]
+renderDefaultHashtags=true
+renderArticleHashtags=true
diff --git a/layouts/index.activity_outbox.ajson b/layouts/index.activity_outbox.ajson
index 7ffc6c5ddf65157fff429724a8e0ea844885fa07..689918407bbc72b796cf540f9821c829b4f955ec 100644
--- a/layouts/index.activity_outbox.ajson
+++ b/layouts/index.activity_outbox.ajson
@@ -28,22 +28,35 @@
       "object": {
         "id": "{{ .Permalink }}",
         "type": "Note",
-        "content": {{ printf "\"" | safeHTML }}<b>{{.Title}}</b>{{ if .Summary }}<br>{{ replace (replace .Summary "\n" "<br>") "\r" "" }}{{ end }}<br><br>Read more here:<br><a href='{{.Permalink}}'>{{.Permalink}}</a>{{ printf "\"" | safeHTML }},
+        "content": {{ printf "\"" | safeHTML }}<b>{{.Title}}</b>{{ if .Summary }}<br>{{ replace (replace .Summary "\n" "<br>") "\r" "" }}{{ end }}<br><br>Read more here:<br><a href='{{.Permalink}}'>{{.Permalink}}</a>{{ if .Site.Params.renderArticleHashtags }}{{ if .Params.tags }}<br>{{ range $indexArticleTags, $elementArticleTag := .Params.tags }}{{ if ne $indexArticleTags 0 }} {{ end }}<a href='{{ site.BaseURL }}tags/{{ $elementArticleTag }}' class='mention hashtag' rel='tag'>#<span>{{ $elementArticleTag }}</span></a>{{ end }}{{ end }}{{ end }}{{ if .Site.Params.renderDefaultHashtags }}{{ if .Site.Params.postHashtags }}{{ range $indexTags, $elementTag := .Site.Params.postHashtags }}{{ if ne $indexTags 0 }} {{ end }}#{{ $elementTag }}{{ end }}{{ end }}{{ end }}{{ printf "\"" | safeHTML }},
         "url": "{{.Permalink}}",
         "attributedTo": "{{ .Site.BaseURL }}{{ site.Params.apUser | lower}}",
         "to": "https://www.w3.org/ns/activitystreams#Public",
-        {{ if .Site.Params.postHashtags }}
+        {{ if (or (and .Site.Params.postHashtags .Site.Params.renderDefaultHashtags) (and .Params.tags .Site.Params.renderArticleHashtags)) }}
         "tag": [
-          {{ range $indexTags, $elementTag := .Site.Params.postHashtags }}
-          {{ if ne $indexTags 0 }}, {{ end }}
+          {{- if (and .Site.Params.postHashtags .Site.Params.renderDefaultHashtags) }}
+          {{- range $indexTags, $elementTag := .Site.Params.postHashtags }}
+          {{- if ne $indexTags 0 }}, {{ end }}
           {
             "type": "Hashtag",
             "href": "https://qoto.org/tags/{{ $elementTag }}",
             "name": "#{{ $elementTag }}"
           }
-          {{ end }}
+          {{- end }}
+          {{- end }}
+          {{- $hasTagContent := (and .Site.Params.postHashtags .Site.Params.renderDefaultHashtags) }}
+          {{- if (and .Params.tags .Site.Params.renderArticleHashtags) }}
+          {{- range $indexTags, $elementTag := .Params.tags }}
+          {{- if (or (ne $indexTags 0) $hasTagContent) }}, {{ end }}
+          {
+            "type": "Hashtag",
+            "href": "https://qoto.org/tags/{{ $elementTag }}",
+            "name": "#{{ $elementTag }}"
+          }
+          {{- end }}
+          {{- end }}
           ],
-        {{ end }}
+        {{- end }}
         "published": {{ dateFormat "2006-01-02T15:04:05-07:00" .Date | jsonify }}
       }
     }