diff --git a/app/src/main/java/com/deniscerri/ytdl/App.kt b/app/src/main/java/com/deniscerri/ytdl/App.kt
index 551e7549..5fa1abf2 100644
--- a/app/src/main/java/com/deniscerri/ytdl/App.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/App.kt
@@ -55,6 +55,13 @@ class App : Application() {
                     .filter { it.status == ObserveSourcesRepository.SourceStatus.ACTIVE && !it.hasReachedEnd() }
                     .forEach { scheduler.schedule(it) }         // idempotent: FLAG_UPDATE_CURRENT updates in place
 
+                val useBgUtilPoTokenServer = sharedPreferences.getBoolean("use_bgutils_potoken_generator", false)
+                val bgUtilsMethod = sharedPreferences.getString("bgutils_potoken_method", "server")
+                val requiresServer = useBgUtilPoTokenServer && bgUtilsMethod == "server"
+                if (requiresServer) {
+                    BgUtilsPoTokenGeneratorUtil.acquireServer(this@App)
+                }
+
             }catch (e: Exception){
                 Looper.prepare().runCatching {
                     Toast.makeText(this@App, e.message, Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/java/com/deniscerri/ytdl/work/YTDLPCoroutineWorker.kt b/app/src/main/java/com/deniscerri/ytdl/work/YTDLPCoroutineWorker.kt
index 3faaba11..0824d482 100644
--- a/app/src/main/java/com/deniscerri/ytdl/work/YTDLPCoroutineWorker.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/work/YTDLPCoroutineWorker.kt
@@ -39,12 +39,13 @@ abstract class YTDLPCoroutineWorker(
             runWork()
         } catch (e: Exception) {
             Result.failure()
-        } finally {
-            if (requiresServer) {
-                // Decrement job count & auto-stop service when 0 active jobs remain
-                BgUtilsPoTokenGeneratorUtil.releaseServer(context)
-            }
         }
+//        finally {
+//            if (requiresServer) {
+//                // Decrement job count & auto-stop service when 0 active jobs remain
+//                BgUtilsPoTokenGeneratorUtil.releaseServer(context)
+//            }
+//        }
     }
 
     private suspend fun isBgUtilsServerAlive(): Boolean = withContext(Dispatchers.IO) {