diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index eb1716f782..72ad8b1890 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1278,7 +1278,7 @@ class DeviceMixin(object): # {{{
         :param files: List of either paths to files or file like objects
         '''
         titles = [i.title for i in metadata]
-        plugboards = self.library_view.model().db.prefs.get('plugboards', None)
+        plugboards = self.library_view.model().db.prefs.get('plugboards', {})
         job = self.device_manager.upload_books(
                 Dispatcher(self.books_uploaded),
                 files, names, on_card=on_card,
diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py
index 54671da4b4..2504832df7 100644
--- a/src/calibre/library/save_to_disk.py
+++ b/src/calibre/library/save_to_disk.py
@@ -233,7 +233,7 @@ def save_book_to_disk(id, db, root, opts, length):
     written = False
     for fmt in formats:
         dev_name = 'save to disk'
-        plugboards = db.prefs.get('plugboards', None)
+        plugboards = db.prefs.get('plugboards', {})
         cpb = None
         if fmt in plugboards:
             cpb = plugboards[fmt]