diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57ed4099..67028f8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,12 @@
 
 * Builtin Prosody: settings archive_expires_after was useless without mod_mam
 
+## v2.2.1
+
+### Fixes
+
+* Revert «Better default values for settings», because of a [bug in Peertube](https://github.com/Chocobozzz/PeerTube/issues/4106)
+
 ## v2.2.0
 
 ### Features
diff --git a/package-lock.json b/package-lock.json
index 8d18e0bc..4339ccb9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-plugin-livechat",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a7f0a539..1158b72f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube-plugin-livechat",
   "description": "PeerTube plugin livechat",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "John Livingston",
   "bugs": "https://github.com/JohnXLivingston/peertube-plugin-livechat/issues",
   "clientScripts": [
diff --git a/server/lib/settings.ts b/server/lib/settings.ts
index 3a9c9421..a48e5806 100644
--- a/server/lib/settings.ts
+++ b/server/lib/settings.ts
@@ -56,7 +56,7 @@ Before asking for help, please use this diagnostic tool:
     name: 'chat-auto-display',
     label: 'Automatically open the chat',
     type: 'input-checkbox',
-    default: true,
+    default: false, // FIXME: set true when Peertube 3.2.0 is out (https://github.com/Chocobozzz/PeerTube/issues/4106)
     private: false
   })
   registerSetting({
@@ -64,20 +64,20 @@ Before asking for help, please use this diagnostic tool:
     label: 'Show the «open in new window» button',
     private: false,
     type: 'input-checkbox',
-    default: true
+    default: false // FIXME: set true when Peertube 3.2.0 is out (https://github.com/Chocobozzz/PeerTube/issues/4106)
   })
   registerSetting({
     name: 'chat-only-locals',
     label: 'Chats are only available for local videos.',
     type: 'input-checkbox',
-    default: true,
+    default: false, // FIXME: set true when Peertube 3.2.0 is out (https://github.com/Chocobozzz/PeerTube/issues/4106)
     private: false
   })
   registerSetting({
     name: 'chat-all-lives',
     label: 'Activate chat for all lives',
     type: 'input-checkbox',
-    default: true,
+    default: false, // FIXME: set true when Peertube 3.2.0 is out (https://github.com/Chocobozzz/PeerTube/issues/4106)
     descriptionHTML: 'If checked, a chat will be added to all lives.',
     private: false
   })