diff --git a/libraries/BluetoothAudio/src/BluetoothAudioConsumerI2S.cpp b/libraries/BluetoothAudio/src/BluetoothAudioConsumerI2S.cpp
index 75e686d68..4e4d55519 100644
--- a/libraries/BluetoothAudio/src/BluetoothAudioConsumerI2S.cpp
+++ b/libraries/BluetoothAudio/src/BluetoothAudioConsumerI2S.cpp
@@ -75,10 +75,8 @@ void BluetoothAudioConsumerI2S::fill() {
         _a2dpSink->playback_handler((int16_t *) buff, 32);
         num_samples -= 64;
         for (int i = 0; i < 64; i++) {
-            int32_t tmp = buff[i];
-            tmp *= _gain;
-            tmp >>= 8;
-            _i2s->write((int16_t)tmp);
+            buff[i] = (((int32_t)buff[i]) * _gain ) >> 8;
         }
+        _i2s->write((uint8_t *)buff, 64 * 2);
     }
 }
diff --git a/libraries/BluetoothAudio/src/BluetoothAudioConsumerPWM.cpp b/libraries/BluetoothAudio/src/BluetoothAudioConsumerPWM.cpp
index 140f0b1aa..9a0eeec45 100644
--- a/libraries/BluetoothAudio/src/BluetoothAudioConsumerPWM.cpp
+++ b/libraries/BluetoothAudio/src/BluetoothAudioConsumerPWM.cpp
@@ -76,10 +76,8 @@ void BluetoothAudioConsumerPWM::fill() {
         _a2dpSink->playback_handler((int16_t *) buff, 32);
         num_samples -= 64;
         for (int i = 0; i < 64; i++) {
-            int32_t tmp = buff[i];
-            tmp *= _gain;
-            tmp >>= 8;
-            _pwm->write((int16_t)tmp);
+            buff[i] = (((int32_t)buff[i]) * _gain ) >> 8;
         }
+        _pwm->write((uint8_t *)buff, 64 * 2);
     }
 }