diff --git a/player.py b/player.py
index 90597b1..671280b 100644
--- a/player.py
+++ b/player.py
@@ -297,9 +297,10 @@ class Player():
 
     def output(self, name=None):
         wasPlaying = self.state.state["playing"]
+        name = None if name == "none" else name
+
         self.quit()
         self.state.update("output", name)
-        self.state.update("loaded_item", None)
         try:
             if name:
                 mixer.init(44100, -16, 2, 1024, devicename=name)
@@ -309,6 +310,9 @@ class Player():
             self.logger.log.exception("Failed to init mixer with device name: " + str(name))
             return False
 
+        loadedItem = self.state.state["loaded_item"]
+        if (loadedItem):
+            self.load(loadedItem.timeslotitemid)
         if wasPlaying:
             self.unpause()
 
diff --git a/templates/config.html b/templates/config.html
index 7f37597..33f5e8d 100644
--- a/templates/config.html
+++ b/templates/config.html
@@ -1,8 +1,9 @@
 {% extends 'base.html' %}
 {% block content_inner %}
 <code>
+  <a href="/player/0/output/none">Set Channel 0</a> <a href="/player/1/output/none">Set Channel 1</a> <a href="/player/2/output/none">Set Channel 2</a> - System Default Output<br>
   {% for output in data.outputs %}
     <a href="/player/0/output/{{output.name}}">Set Channel 0</a> <a href="/player/1/output/{{output.name}}">Set Channel 1</a> <a href="/player/2/output/{{output.name}}">Set Channel 2</a> - {{output.name}}<br>
   {% endfor %}
 </code>
-{% endblock %}
\ No newline at end of file
+{% endblock %}