diff --git a/src/leap/soledad/server/_incoming.py b/src/leap/soledad/server/_incoming.py
index 8d057ae931cbba0ff1b1114493dc8e98ea3fd503..71e71d7f6a401f2ed55ee68967f9e40a46916e0a 100644
--- a/src/leap/soledad/server/_incoming.py
+++ b/src/leap/soledad/server/_incoming.py
@@ -64,7 +64,7 @@ class IncomingResource(Resource):
             raw_content = request.content.read()
             preamble = self.formatter.preamble(raw_content, doc_id)
             request.content = BytesIO(preamble + raw_content)
-            d = db.write_blob(uuid, doc_id, request, namespace='incoming')
+            d = db.write_blob(uuid, doc_id, request, namespace='MX')
             d.addCallback(lambda _: self._finish(request))
         return NOT_DONE_YET
 
diff --git a/testing/tests/server/test_incoming_server.py b/testing/tests/server/test_incoming_server.py
index 78bc86a85789d7f124a60f1574caa447aca27e66..8886a7213796c03528a57365b53629f1c144a035 100644
--- a/testing/tests/server/test_incoming_server.py
+++ b/testing/tests/server/test_incoming_server.py
@@ -82,6 +82,6 @@ class IncomingOnCouchServerTestCase(CouchDBTestCase):
 
         db = self.state.open_database(user_id)
         request = DummyRequest([user_id, doc_id])
-        yield db.read_blob(user_id, doc_id, request, 'incoming')
+        yield db.read_blob(user_id, doc_id, request, 'MX')
         expected = formatter.preamble(content, doc_id) + content
         self.assertEquals(expected, request.written[0])