diff --git a/daemon.py b/daemon.py
index 551175b04..265d29270 100644
--- a/daemon.py
+++ b/daemon.py
@@ -634,8 +634,8 @@ class PubServer(BaseHTTPRequestHandler):
         if self.headers.get('Content-type'):
             headersDict['Content-type']=self.headers['Content-type']
         if self.headers.get('Content-Length'):
-            headersDict['Content-Length']=self.headers['Content-Length']
-        if self.headers.get('content-length'):
+            headersDict['Content-Length']=self.headers['Content-Length']            
+        elif self.headers.get('content-length'):
             headersDict['content-length']=self.headers['content-length']
 
         # For follow activities add a 'to' field, which is a copy