diff --git a/mopidy/core/mixer.py b/mopidy/core/mixer.py
index d68cb842..2815fb0c 100644
--- a/mopidy/core/mixer.py
+++ b/mopidy/core/mixer.py
@@ -57,14 +57,14 @@ class MixerController(object):
         validation.check_integer(volume, min=0, max=100)
 
         if self._mixer is None:
-            return False
+            return False  # TODO: 2.0 return None
 
         with _mixer_error_handling(self._mixer):
             result = self._mixer.set_volume(volume).get()
             validation.check_instance(result, bool)
             return result
 
-        return None
+        return False
 
     def get_mute(self):
         """Get mute state.
@@ -91,11 +91,11 @@ class MixerController(object):
         """
         validation.check_boolean(mute)
         if self._mixer is None:
-            return False
+            return False  # TODO: 2.0 return None
 
         with _mixer_error_handling(self._mixer):
             result = self._mixer.set_mute(bool(mute)).get()
             validation.check_instance(result, bool)
             return result
 
-        return None
+        return False
diff --git a/tests/core/test_mixer.py b/tests/core/test_mixer.py
index 40e13aea..45241fec 100644
--- a/tests/core/test_mixer.py
+++ b/tests/core/test_mixer.py
@@ -131,7 +131,7 @@ class SetVolumeBadBackendTest(MockBackendCoreMixerBase):
 
     def test_backend_returns_wrong_type(self):
         self.mixer.set_volume.return_value.get.return_value = 'done'
-        self.assertIs(self.core.mixer.set_volume(30), None)
+        self.assertFalse(self.core.mixer.set_volume(30))
 
 
 class GetMuteBadBackendTest(MockBackendCoreMixerBase):
@@ -153,4 +153,4 @@ class SetMuteBadBackendTest(MockBackendCoreMixerBase):
 
     def test_backend_returns_wrong_type(self):
         self.mixer.set_mute.return_value.get.return_value = 'done'
-        self.assertIs(self.core.mixer.set_mute(True), None)
+        self.assertFalse(self.core.mixer.set_mute(True))