diff --git a/lib/features/player/core/init.dart b/lib/features/player/core/init.dart
index abcf013..7b6c0f7 100644
--- a/lib/features/player/core/init.dart
+++ b/lib/features/player/core/init.dart
@@ -9,7 +9,7 @@ import 'package:vaani/settings/models/app_settings.dart';
 
 Future<void> configurePlayer() async {
   // for playing audio on windows, linux
-  JustAudioMediaKit.ensureInitialized();
+  JustAudioMediaKit.ensureInitialized(windows: false);
 
   // for configuring how this app will interact with other audio apps
   final session = await AudioSession.instance;
diff --git a/pubspec.lock b/pubspec.lock
index 31f219d..85fc208 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -766,10 +766,10 @@ packages:
     dependency: "direct main"
     description:
       name: just_audio
-      sha256: f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e
+      sha256: "9694e4734f515f2a052493d1d7e0d6de219ee0427c7c29492e246ff32a219908"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.46"
+    version: "0.10.5"
   just_audio_background:
     dependency: "direct main"
     description:
@@ -803,6 +803,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.16"
+  just_audio_windows:
+    dependency: "direct main"
+    description:
+      name: just_audio_windows
+      sha256: b1ba5305d841c0e3883644e20fc11aaa23f28cfdd43ec20236d1e119a402ef29
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2"
   leak_tracker:
     dependency: transitive
     description:
@@ -923,14 +931,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
-  media_kit_libs_windows_audio:
-    dependency: "direct main"
-    description:
-      name: media_kit_libs_windows_audio
-      sha256: c2fd558cc87b9d89a801141fcdffe02e338a3b21a41a18fbd63d5b221a1b8e53
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.9"
   menu_base:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 67b697d..9021bc9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -62,22 +62,23 @@ dependencies:
   isar: ^4.0.0-dev.13
   isar_flutter_libs: ^4.0.0-dev.13
   json_annotation: ^4.9.0
-  just_audio: ^0.9.37
+  just_audio: ^0.10.5
   just_audio_background:
     # TODO Remove git dep when https://github.com/ryanheise/just_audio/issues/912 is closed
     git:
       url: https://github.com/Dr-Blank/just_audio
       ref: media-notification-config
       path: just_audio_background
+  just_audio_windows: ^0.2.2
   just_audio_media_kit: ^2.0.4
+  media_kit_libs_linux: any
+  # media_kit_libs_windows_audio: any
   list_wheel_scroll_view_nls: ^0.0.3
   logging: ^1.2.0
   logging_appenders: ^1.3.1
   lottie: ^3.1.0
   material_color_utilities: ^0.11.1
   material_symbols_icons: ^4.2785.1
-  media_kit_libs_linux: any
-  media_kit_libs_windows_audio: any
   miniplayer:
     git:
       url: https://github.com/Dr-Blank/miniplayer.git
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 4f18e92..db5c691 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -8,7 +8,7 @@
 
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <isar_flutter_libs/isar_flutter_libs_plugin.h>
-#include <media_kit_libs_windows_audio/media_kit_libs_windows_audio_plugin_c_api.h>
+#include <just_audio_windows/just_audio_windows_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
@@ -21,8 +21,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
   IsarFlutterLibsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("IsarFlutterLibsPlugin"));
-  MediaKitLibsWindowsAudioPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("MediaKitLibsWindowsAudioPluginCApi"));
+  JustAudioWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("JustAudioWindowsPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index ed05458..cc33937 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -5,7 +5,7 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
   isar_flutter_libs
-  media_kit_libs_windows_audio
+  just_audio_windows
   permission_handler_windows
   screen_retriever_windows
   share_plus