diff --git a/src/calibre/utils/ipc/__init__.py b/src/calibre/utils/ipc/__init__.py
index 884438e5a2..3843fc2395 100644
--- a/src/calibre/utils/ipc/__init__.py
+++ b/src/calibre/utils/ipc/__init__.py
@@ -40,10 +40,12 @@ def socket_address(which):
                 ans += '-' + user[:100] + 'x'
     else:
         user = force_unicode(os.environ.get('USER') or os.path.basename(os.path.expanduser('~')), filesystem_encoding)
-        sock_name = '{}-calibre-{}.socket'.format(ascii_filename(user).replace(' ', '_'), which)
         if islinux:
+            sock_name = '{}-calibre-{}.socket'.format(ascii_filename(user).replace(' ', '_'), which)
             ans = '\0' + sock_name
         else:
+            # tempdir already contains calibre in its path
+            sock_name = '{}-{}.sock'.format(ascii_filename(user).replace(' ', '_'), which)
             from tempfile import gettempdir
             tmp = force_unicode(gettempdir(), filesystem_encoding)
             ans = os.path.join(tmp, sock_name)