diff --git a/src/engine/audio/audio_driver_alsa.cc b/src/engine/audio/audio_driver_alsa.cc
index 75d41b1..689d8c7 100644
--- a/src/engine/audio/audio_driver_alsa.cc
+++ b/src/engine/audio/audio_driver_alsa.cc
@@ -164,7 +164,8 @@ int AudioDriverAlsa::GetHardwareSampleRate() {
 void AudioDriverAlsa::StartAudioThread() {
   LOG << "Starting audio thread.";
   terminate_audio_thread_.store(false, std::memory_order_relaxed);
-  suspend_audio_thread_.store(true, std::memory_order_relaxed);
+  suspend_audio_thread_.store(delegate_ ? false : true,
+                              std::memory_order_relaxed);
   audio_thread_ = std::thread(&AudioDriverAlsa::AudioThreadMain, this);
 }
 
diff --git a/src/engine/audio/audio_driver_oboe.cc b/src/engine/audio/audio_driver_oboe.cc
index 01e269f..a49ed7d 100644
--- a/src/engine/audio/audio_driver_oboe.cc
+++ b/src/engine/audio/audio_driver_oboe.cc
@@ -15,13 +15,13 @@ AudioDriverOboe::~AudioDriverOboe() = default;
 
 void AudioDriverOboe::SetDelegate(AudioDriverDelegate* delegate) {
   delegate_ = delegate;
-  Resume();
+  stream_->start();
 }
 
 bool AudioDriverOboe::Initialize() {
   LOG << "Initializing audio system.";
 
-  return RestartStream(true);
+  return RestartStream();
 }
 
 void AudioDriverOboe::Shutdown() {
@@ -31,11 +31,11 @@ void AudioDriverOboe::Shutdown() {
 }
 
 void AudioDriverOboe::Suspend() {
-  stream_->stop();
+  stream_->pause();
 }
 
 void AudioDriverOboe::Resume() {
-  RestartStream();
+  stream_->start();
 }
 
 int AudioDriverOboe::GetHardwareSampleRate() {
@@ -64,7 +64,7 @@ void AudioDriverOboe::StreamCallback::onErrorAfterClose(
   driver_->RestartStream();
 }
 
-bool AudioDriverOboe::RestartStream(bool suspended) {
+bool AudioDriverOboe::RestartStream() {
   oboe::AudioStreamBuilder builder;
   oboe::Result result =
       builder.setSharingMode(oboe::SharingMode::Exclusive)
@@ -88,7 +88,7 @@ bool AudioDriverOboe::RestartStream(bool suspended) {
     return false;
   }
 
-  if (!suspended)
+  if (delegate_)
     stream_->start();
   return true;
 }
diff --git a/src/engine/audio/audio_driver_oboe.h b/src/engine/audio/audio_driver_oboe.h
index 63c477d..01d961f 100644
--- a/src/engine/audio/audio_driver_oboe.h
+++ b/src/engine/audio/audio_driver_oboe.h
@@ -50,7 +50,7 @@ class AudioDriverOboe final : public AudioDriver {
 
   AudioDriverDelegate* delegate_ = nullptr;
 
-  bool RestartStream(bool suspended = false);
+  bool RestartStream();
 };
 
 }  // namespace eng