diff --git a/openlp/core/lib/projector/pjlink1.py b/openlp/core/lib/projector/pjlink1.py
index 99a1ed685..eb2753cbf 100644
--- a/openlp/core/lib/projector/pjlink1.py
+++ b/openlp/core/lib/projector/pjlink1.py
@@ -113,13 +113,13 @@ class PJLink(QtNetwork.QTcpSocket):
         self.port = port
         self.pin = pin
         super().__init__()
-        self.mac_adx = None if 'mac_adx' not in kwargs else kwargs['mac_adx']
+        self.mac_adx = kwargs.get('mac_adx')
         self.dbid = None
         self.location = None
         self.notes = None
-        self.dbid = None if 'dbid' not in kwargs else kwargs['dbid']
-        self.location = None if 'location' not in kwargs else kwargs['location']
-        self.notes = None if 'notes' not in kwargs else kwargs['notes']
+        self.dbid = kwargs.get('dbid')
+        self.location = kwargs.get('location')
+        self.notes = kwargs.get('notes')
         # Poll time 20 seconds unless called with something else
         self.poll_time = 20000 if 'poll_time' not in kwargs else kwargs['poll_time'] * 1000
         # Timeout 5 seconds unless called with something else