diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc
index 4c1eec5ea..4c52d99b9 100644
--- a/src/audio/baudio/SDL_beaudio.cc
+++ b/src/audio/baudio/SDL_beaudio.cc
@@ -151,8 +151,6 @@ BEOSAUDIO_OpenDevice(_THIS, const char *devname, int iscapture)
         }
     }
 
-    format.buffer_size = _this->spec.samples;
-
     if (!valid_datatype) {      /* shouldn't happen, but just in case... */
         BEOSAUDIO_CloseDevice(_this);
         SDL_SetError("Unsupported audio format");
@@ -162,6 +160,8 @@ BEOSAUDIO_OpenDevice(_THIS, const char *devname, int iscapture)
     /* Calculate the final parameters for this audio specification */
     SDL_CalculateAudioSpec(&_this->spec);
 
+    format.buffer_size = _this->spec.size;
+
     /* Subscribe to the audio stream (creates a new thread) */
     sigset_t omask;
     SDL_MaskSignals(&omask);