diff --git a/common/modules/webtorrent.js b/common/modules/webtorrent.js
index 0dd33e3c..2d4ab787 100644
--- a/common/modules/webtorrent.js
+++ b/common/modules/webtorrent.js
@@ -3,9 +3,27 @@ import HTTPTracker from 'bittorrent-tracker/lib/client/http-tracker.js'
 import { hex2bin, arr2hex, text2arr } from 'uint8-util'
 import Parser from './parser.js'
 import { defaults, fontRx, subRx, videoRx } from './util.js'
+import { SUPPORTS } from './support.js'
 
 const LARGE_FILESIZE = 32_000_000_000
 
+const announce = [
+  atob('d3NzOi8vdHJhY2tlci5vcGVud2VidG9ycmVudC5jb20='),
+  atob('d3NzOi8vdHJhY2tlci53ZWJ0b3JyZW50LmRldg=='),
+  atob('d3NzOi8vdHJhY2tlci5maWxlcy5mbTo3MDczL2Fubm91bmNl'),
+  atob('d3NzOi8vdHJhY2tlci5idG9ycmVudC54eXov'),
+  atob('dWRwOi8vb3Blbi5zdGVhbHRoLnNpOjgwL2Fubm91bmNl'),
+  atob('aHR0cDovL255YWEudHJhY2tlci53Zjo3Nzc3L2Fubm91bmNl'),
+  atob('dWRwOi8vdHJhY2tlci5vcGVudHJhY2tyLm9yZzoxMzM3L2Fubm91bmNl'),
+  atob('dWRwOi8vZXhvZHVzLmRlc3luYy5jb206Njk2OS9hbm5vdW5jZQ=='),
+  atob('dWRwOi8vdHJhY2tlci5jb3BwZXJzdXJmZXIudGs6Njk2OS9hbm5vdW5jZQ=='),
+  atob('dWRwOi8vOS5yYXJiZy50bzoyNzEwL2Fubm91bmNl'),
+  atob('dWRwOi8vdHJhY2tlci50b3JyZW50LmV1Lm9yZzo0NTEvYW5ub3VuY2U='),
+  atob('aHR0cDovL29wZW4uYWNnbnh0cmFja2VyLmNvbTo4MC9hbm5vdW5jZQ=='),
+  atob('aHR0cDovL2FuaWRleC5tb2U6Njk2OS9hbm5vdW5jZQ=='),
+  atob('aHR0cDovL3RyYWNrZXIuYW5pcmVuYS5jb206ODAvYW5ub3VuY2U=')
+]
+
 let storedSettings = {}
 
 try {
@@ -179,17 +197,11 @@ export default class TorrentClient extends WebTorrent {
       path: this.settings.torrentPath,
       destroyStoreOnDestroy: !this.settings.torrentPersist,
       skipVerify,
-      announce: [
-        'wss://tracker.openwebtorrent.com',
-        'wss://tracker.webtorrent.dev',
-        'wss://tracker.files.fm:7073/announce',
-        'wss://tracker.btorrent.xyz/',
-        atob('aHR0cDovL255YWEudHJhY2tlci53Zjo3Nzc3L2Fubm91bmNl')
-      ]
+      announce
     })
 
     torrent.once('done', () => {
-      localStorage.setItem('lastFinished', true)
+      if (SUPPORTS.torrentPersist && this.settings.torrentPath) localStorage.setItem('lastFinished', true)
     })
   }
 
diff --git a/common/views/WatchTogether/WatchTogether.svelte b/common/views/WatchTogether/WatchTogether.svelte
index f65dc757..ed5fc814 100644
--- a/common/views/WatchTogether/WatchTogether.svelte
+++ b/common/views/WatchTogether/WatchTogether.svelte
@@ -21,10 +21,10 @@
   function joinLobby (code = generateRandomHexCode(16)) {
     if (p2pt) cleanup()
     p2pt = new P2PT([
-      'wss://tracker.openwebtorrent.com',
-      'wss://tracker.webtorrent.dev',
-      'wss://tracker.files.fm:7073/announce',
-      'wss://tracker.btorrent.xyz/'
+      atob('d3NzOi8vdHJhY2tlci5vcGVud2VidG9ycmVudC5jb20='),
+      atob('d3NzOi8vdHJhY2tlci53ZWJ0b3JyZW50LmRldg=='),
+      atob('d3NzOi8vdHJhY2tlci5maWxlcy5mbTo3MDczL2Fubm91bmNl'),
+      atob('d3NzOi8vdHJhY2tlci5idG9ycmVudC54eXov')
     ], code)
     p2pt.on('peerconnect', async peer => {
       console.log(peer.id)