diff --git a/mopidy/scanner.py b/mopidy/scanner.py
index 991a0864..6537f35a 100644
--- a/mopidy/scanner.py
+++ b/mopidy/scanner.py
@@ -101,4 +101,5 @@ class Scanner(object):
         self.loop.run()
 
     def stop(self):
+        self.pipe.set_state(gst.STATE_NULL)
         self.loop.quit()