diff --git a/CHANGELOG.md b/CHANGELOG.md
index 404b5904a..e562c9958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - junos: redact cleartext passwords embedded in archive-site URLs. Fixes #3640 (@KalebFenley)
 - siklu: allow parenthesis in prompt. Fixes #3841 (@ytti)
 - fortios: allow parenthesis in prompt. Fixes #3846 (@ytti)
+- os6: hide snmp-server community strings in the secret filter (@Jurgen1994)
 - fortigate: prompt can contain HA cluster status. Fixes #3846 (@robertcheramy)
 - aoscx: hide power consumption on rows where PSU output is N/A. Fixes #3864 (@FusionBrah)
 - aoscx: hide input voltage readings in "show environment power-supply input-voltage". Fixes #3864 (@FusionBrah)
diff --git a/lib/oxidized/model/os6.rb b/lib/oxidized/model/os6.rb
index 4a9767fd2..3dede4708 100644
--- a/lib/oxidized/model/os6.rb
+++ b/lib/oxidized/model/os6.rb
@@ -14,6 +14,7 @@ class OS6 < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /(password )(\S+)/, '\1<secret hidden>'
+    cfg.gsub! /^(snmp-server community )\S+(.*)/, '\1<secret hidden>\2'
     cfg
   end