diff --git a/daemon.py b/daemon.py
index d6a9ed426..b2d0a1163 100644
--- a/daemon.py
+++ b/daemon.py
@@ -4134,7 +4134,14 @@ class PubServer(BaseHTTPRequestHandler):
                             if fields['mediaInstance']=='on':
                                 self.server.mediaInstance=True
                                 self.server.defaultTimeline='tlmedia'
-                            setConfigParam(self.server.baseDir,"mediaInstance",self.server.mediaInstance)
+                            setConfigParam(self.server.baseDir,"mediaInstance", \
+                                           self.server.mediaInstance)
+                        else:
+                            if self.server.mediaInstance:
+                                self.server.mediaInstance=False
+                                self.server.defaultTimeline='inbox'
+                                setConfigParam(self.server.baseDir,"mediaInstance", \
+                                               self.server.mediaInstance)
                         # only receive DMs from accounts you follow
                         followDMsFilename= \
                             self.server.baseDir+'/accounts/'+ \