1 files changed, 2 insertions, 3 deletions

diff --git a/apps/codecs/wavpack.c b/apps/codecs/wavpack.c
index 680673fec7..1485eedf8b 100644
--- a/apps/codecs/wavpack.c
+++ b/apps/codecs/wavpack.c
@@ -57,9 +57,6 @@ enum codec_status codec_main(void)
     while (!*ci->taginfo_ready && !ci->stop_codec)
         ci->sleep(1);
         
-    ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency);
-    codec_set_replaygain(ci->id3);
-   
     /* Create a decoder instance */
     wpc = WavpackOpenFileInput (read_callback, error);
 
@@ -68,6 +65,8 @@ enum codec_status codec_main(void)
         goto done;
     }
 
+    ci->configure(DSP_SWITCH_FREQUENCY, WavpackGetSampleRate (wpc));
+    codec_set_replaygain(ci->id3);
     bps = WavpackGetBytesPerSample (wpc);
     nchans = WavpackGetReducedChannels (wpc);
     ci->configure(DSP_SET_STEREO_MODE, nchans == 2 ? STEREO_INTERLEAVED : STEREO_MONO);