diff --git a/devices/PCC.py b/devices/PCC.py
index 59c9dacf3de148c0fb66e06d4ee058be885b7e2d..4a76f5120f2ccde0c035821223e123e073c635cb 100644
--- a/devices/PCC.py
+++ b/devices/PCC.py
@@ -126,8 +126,11 @@ class PCC(hardware_device):
 		""" user code here. is called when the state is set to INIT """
 
 		#set up the OPC ua client
-		self.OPCua_client = OPCUAConnection("opc.tcp://{}:{}/".format(self.OPC_Server_Name, self.OPC_Server_Port), "http://lofar.eu", self.OPC_Time_Out, self.Standby, self.Fault, self)
+		namespace = "http://lofar.eu"
+		if self.OPC_Namespace is not None:
+			namespace = self.OPC_Namespace
 
+		self.OPCua_client = OPCUAConnection("opc.tcp://{}:{}/".format(self.OPC_Server_Name, self.OPC_Server_Port), namespace, self.OPC_Time_Out, self.Standby, self.Fault, self)
 
 		# map the attributes to the OPC ua comm client
 		for i in self.attr_list():