diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py
index 93b2769e..8dfe0fa8 100644
--- a/mopidy/audio/actor.py
+++ b/mopidy/audio/actor.py
@@ -100,6 +100,9 @@ class Audio(pykka.ThreadingActor):
         playbin = gst.element_factory_make('playbin2')
         playbin.set_property('flags', PLAYBIN_FLAGS)
 
+        playbin.set_property('buffer-size', 2*1024*1024)
+        playbin.set_property('buffer-duration', 2*gst.SECOND)
+
         self._connect(playbin, 'about-to-finish', self._on_about_to_finish)
         self._connect(playbin, 'notify::source', self._on_new_source)