diff --git a/client/package-lock.json b/client/package-lock.json
index 8d5cd100..f2f11ebc 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/client/package.json b/client/package.json
index bc2d5ed2..176c5d66 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",
   "scripts": {
diff --git a/client/pages/audiobook/_id/manage.vue b/client/pages/audiobook/_id/manage.vue
index be956a79..9f858a81 100644
--- a/client/pages/audiobook/_id/manage.vue
+++ b/client/pages/audiobook/_id/manage.vue
@@ -91,6 +91,14 @@
             A backup of your original audio files will be stored in <span class="rounded-md bg-neutral-600 text-sm text-white py-0.5 px-1 font-mono">/metadata/cache/items/{{ libraryItemId }}/</span>. Make sure to periodically purge items cache.
           </p>
         </div>
+        <div v-if="selectedTool === 'm4b'" class="flex items-start mb-2">
+          <span class="material-icons text-base text-warning pt-1">star</span>
+          <p class="text-gray-200 ml-2">Encoding can take up to 30 minutes.</p>
+        </div>
+        <div v-if="selectedTool === 'm4b'" class="flex items-start mb-2">
+          <span class="material-icons text-base text-warning pt-1">star</span>
+          <p class="text-gray-200 ml-2">If you have the watcher disabled you will need to re-scan this audiobook afterwards.</p>
+        </div>
         <div class="flex items-start mb-2">
           <span class="material-icons text-base text-warning pt-1">star</span>
           <p class="text-gray-200 ml-2">Once the task is started you can navigate away from this page.</p>
diff --git a/client/pages/config/index.vue b/client/pages/config/index.vue
index 4a9c38f3..be26f331 100644
--- a/client/pages/config/index.vue
+++ b/client/pages/config/index.vue
@@ -193,7 +193,7 @@
             </ui-tooltip>
           </div>
 
-          <div class="flex items-center py-2">
+          <!-- <div class="flex items-center py-2">
             <ui-toggle-switch v-model="newServerSettings.scannerUseTone" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerUseTone', val)" />
             <ui-tooltip text="Tone library for metadata">
               <p class="pl-4">
@@ -201,7 +201,7 @@
                 <span class="material-icons icon-text text-sm">info_outlined</span>
               </p>
             </ui-tooltip>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
diff --git a/package-lock.json b/package-lock.json
index 17bf4bfb..c7297809 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -1613,4 +1613,4 @@
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
     }
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 25bebfa4..c168246f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",
   "scripts": {
@@ -38,4 +38,4 @@
     "socket.io": "^4.4.1",
     "xml2js": "^0.4.23"
   }
-}
+}
\ No newline at end of file
diff --git a/server/scanner/MediaFileScanner.js b/server/scanner/MediaFileScanner.js
index fb22cb25..95854e23 100644
--- a/server/scanner/MediaFileScanner.js
+++ b/server/scanner/MediaFileScanner.js
@@ -60,12 +60,13 @@ class MediaFileScanner {
     var probeStart = Date.now()
 
     var probeData = null
-    if (global.ServerSettings.scannerUseTone) {
-      Logger.debug(`[MediaFileScanner] using tone to probe audio file "${libraryFile.metadata.path}"`)
-      probeData = await toneProber.probe(libraryFile.metadata.path, true)
-    } else {
-      probeData = await prober.probe(libraryFile.metadata.path, verbose)
-    }
+    // TODO: Temp not using tone for probing until more testing can be done
+    // if (global.ServerSettings.scannerUseTone) {
+    //   Logger.debug(`[MediaFileScanner] using tone to probe audio file "${libraryFile.metadata.path}"`)
+    //   probeData = await toneProber.probe(libraryFile.metadata.path, true)
+    // } else {
+    probeData = await prober.probe(libraryFile.metadata.path, verbose)
+    // }
 
     if (probeData.error) {
       Logger.error(`[MediaFileScanner] ${probeData.error} : "${libraryFile.metadata.path}"`)