diff --git a/lib/player.js b/lib/player.js
index <HASH>..<HASH> 100644
--- a/lib/player.js
+++ b/lib/player.js
@@ -433,10 +433,12 @@ shaka.Player.prototype.configure = function(config) {
     for (var kind in chosen) {
       if ((kind == 'audio' && audioLangChanged) ||
           (kind == 'text' && textLangChanged)) {
-        if (this.switchingPeriods_)
+        if (this.switchingPeriods_) {
           this.deferredSwitches_[kind] = chosen[kind];
-        else
-          this.streamingEngine_.switch(kind, chosen[kind]);
+        } else {
+          this.streamingEngine_.switch(kind, chosen[kind],
+                                       /* clearBuffer */ true);
+        }
       }
     }
   }
Always clear buffer when changing languages

Otherwise, language changes do not take effect immediately.

Change-Id: Idfd2ea<I>aa4d<I>bf0da9ab<I>f<I>