diff --git a/config/default.yaml b/config/default.yaml
index d400e1067..f9b6c50a3 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -272,7 +272,7 @@ transcoding:
   # If you also enabled the hls format, it will multiply videos storage by 2
   # If disabled, breaks federation with PeerTube instances < 2.1
   webtorrent:
-    enabled: true
+    enabled: false
 
   # /!\ Requires ffmpeg >= 4.1
   # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent:
@@ -281,7 +281,7 @@ transcoding:
   #     * More stable playback (less bugs/infinite loading)
   # If you also enabled the webtorrent format, it will multiply videos storage by 2
   hls:
-    enabled: false
+    enabled: true
 
 live:
   enabled: false
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 895931e7c..f2e75af32 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -282,7 +282,7 @@ transcoding:
   # If you also enabled the hls format, it will multiply videos storage by 2
   # If disabled, breaks federation with PeerTube instances < 2.1
   webtorrent:
-    enabled: true
+    enabled: false
 
   # /!\ Requires ffmpeg >= 4.1
   # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent:
@@ -291,7 +291,7 @@ transcoding:
   #     * More stable playback (less bugs/infinite loading)
   # If you also enabled the webtorrent format, it will multiply videos storage by 2
   hls:
-    enabled: false
+    enabled: true
 
 live:
   enabled: false
diff --git a/config/test.yaml b/config/test.yaml
index 4f0a7e5d9..9a522a983 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -87,6 +87,8 @@ transcoding:
     1080p: true
     1440p: true
     2160p: true
+  webtorrent:
+    enabled: true
   hls:
     enabled: true