diff --git a/configure.py b/configure.py
index 3e6bd835..166276f1 100644
--- a/configure.py
+++ b/configure.py
@@ -1045,7 +1045,7 @@ config.libs = [
             Object(NonMatching, "nw4r/snd/snd_MmlSeqTrackAllocator.cpp"),
             Object(NonMatching, "nw4r/snd/snd_NandSoundArchive.cpp"),
             Object(Matching, "nw4r/snd/snd_PlayerHeap.cpp"),
-            Object(NonMatching, "nw4r/snd/snd_RemoteSpeaker.cpp"),
+            Object(Matching, "nw4r/snd/snd_RemoteSpeaker.cpp"),
             Object(NonMatching, "nw4r/snd/snd_RemoteSpeakerManager.cpp"),
             Object(NonMatching, "nw4r/snd/snd_SeqFile.cpp"),
             Object(NonMatching, "nw4r/snd/snd_SeqPlayer.cpp"),
diff --git a/src/nw4r/snd/snd_RemoteSpeaker.cpp b/src/nw4r/snd/snd_RemoteSpeaker.cpp
index 9f97bd70..74a7357d 100644
--- a/src/nw4r/snd/snd_RemoteSpeaker.cpp
+++ b/src/nw4r/snd/snd_RemoteSpeaker.cpp
@@ -58,8 +58,8 @@ bool RemoteSpeaker::Setup(WPADCallback pCallback) {
         mValidCallbackFlag = false;
     }
 
-    mWpadCallback = pCallback;
     mUserCommand = COMMAND_SPEAKER_ON;
+    mWpadCallback = pCallback;
     mInitFlag = true;
 
     return true;
@@ -357,7 +357,7 @@ void RemoteSpeaker::ContinueAlarmHandler(OSAlarm* pAlarm, OSContext* pCtx) {
     RemoteSpeaker* p = static_cast<RemoteSpeaker*>(OSGetAlarmUserData(pAlarm));
 
     // p->mForceResumeFlag = true;
-    p->mContinueFlag = false;
+    // p->mContinueFlag = false;
 }
 
 void RemoteSpeaker::IntervalAlarmHandler(OSAlarm* pAlarm, OSContext* pCtx) {