diff --git a/docs/api/outputs.rst b/docs/api/outputs.rst
index d801116d..7f487881 100644
--- a/docs/api/outputs.rst
+++ b/docs/api/outputs.rst
@@ -15,5 +15,4 @@ Output implementations
 
 * :class:`mopidy.outputs.custom.CustomOutput`
 * :class:`mopidy.outputs.local.LocalOutput`
-* :class:`mopidy.outputs.null.NullOutput`
 * :class:`mopidy.outputs.shoutcast.ShoutcastOutput`
diff --git a/docs/modules/outputs.rst b/docs/modules/outputs.rst
index c7a45d84..37ff0390 100644
--- a/docs/modules/outputs.rst
+++ b/docs/modules/outputs.rst
@@ -10,6 +10,4 @@ The following GStreamer audio outputs implements the :ref:`output-api`.
 
 .. autoclass:: mopidy.outputs.local.LocalOutput
 
-.. autoclass:: mopidy.outputs.null.NullOutput
-
 .. autoclass:: mopidy.outputs.shoutcast.ShoutcastOutput
diff --git a/mopidy/outputs/null.py b/mopidy/outputs/null.py
deleted file mode 100644
index 975b9724..00000000
--- a/mopidy/outputs/null.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from mopidy.outputs import BaseOutput
-
-class NullOutput(BaseOutput):
-    """
-    Fall-back null output.
-
-    This output will not output anything. It is intended as a fall-back for
-    when setup of all other outputs have failed and should not be used by end
-    users. Inserting this output in such a case ensures that the pipeline does
-    not crash.
-    """
-
-    def describe_bin(self):
-        return 'fakesink'
-
-