diff --git a/src/js/mod.rs b/src/js/mod.rs
index b0ea3833..f51d377c 100644
--- a/src/js/mod.rs
+++ b/src/js/mod.rs
@@ -9,7 +9,11 @@ pub mod wasp {
     extern "C" {
         type WaspHlsPlayer;
 
-        fn buildPlayer(videoElement: JsValue, config: JsValue) -> WaspHlsPlayer;
+        fn buildPlayer(
+            videoElement: JsValue,
+            initialBandwidth: f64,
+            config: JsValue,
+        ) -> WaspHlsPlayer;
 
         #[wasm_bindgen(method)]
         fn load(this: &WaspHlsPlayer, url: &str);
@@ -42,10 +46,24 @@ pub mod wasp {
     pub struct WaspHlsPlayerW(WaspHlsPlayer);
 
     impl WaspHlsPlayerW {
-        pub fn new(video_element: &HtmlElement<Video>, config: Option<WaspHlsConfig>) -> Self {
+        pub fn new_recommended(video_element: &HtmlElement<Video>) -> Self {
+            let config = WaspHlsConfig {
+                buffer_goal: Some(15.),
+                ..Default::default()
+            };
+            Self::new(video_element, Some(config), None)
+        }
+
+        pub fn new(
+            video_element: &HtmlElement<Video>,
+            config: Option<WaspHlsConfig>,
+            initial_bandwidth: Option<usize>,
+        ) -> Self {
             let video_raw: &JsValue = video_element.deref();
             let conf = serde_wasm_bindgen::to_value(&config).unwrap();
-            let wasp = buildPlayer(video_raw.clone(), conf);
+            // Default estimate for 720p
+            let initial_bandwidth = initial_bandwidth.unwrap_or(6500000);
+            let wasp = buildPlayer(video_raw.clone(), initial_bandwidth as f64, conf);
             Self(wasp)
         }
 
diff --git a/src/js/wasp-wrapper.js b/src/js/wasp-wrapper.js
index 0337174b..82e2b826 100644
--- a/src/js/wasp-wrapper.js
+++ b/src/js/wasp-wrapper.js
@@ -1,11 +1,12 @@
 import WaspHlsPlayer from "https://esm.sh/wasp-hls@0.4.2";
 
-export function buildPlayer(videoElement, config) {
+export function buildPlayer(videoElement, initialBandwidth, config) {
     const wasp = new WaspHlsPlayer(videoElement, config);
     wasp.initialize({
         workerUrl: "/wasp/worker.js",
         wasmUrl: "/wasp/wasp_hls_bg.wasm",
+        initialBandwidth,
     });
 
     return wasp;
-}
\ No newline at end of file
+}
diff --git a/src/page/post_view/video_loader.rs b/src/page/post_view/video_loader.rs
index b37c3181..d1e27873 100644
--- a/src/page/post_view/video_loader.rs
+++ b/src/page/post_view/video_loader.rs
@@ -42,7 +42,7 @@ pub fn HlsVideo(video_ref: NodeRef<Video>, allow_show: RwSignal<bool>) -> impl I
         let video = video_ref.get()?;
         let video = video.classes("object-contain h-full");
         log::debug!("initializing wasp player");
-        let wasp_p = WaspHlsPlayerW::new(&video, None);
+        let wasp_p = WaspHlsPlayerW::new_recommended(&video);
         video.set_muted(true);
         video.set_loop(true);
         video.set_autoplay(true);