diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
index 53b007a50b775..e9fa432ca080e 100644
--- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
+++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -211,6 +211,15 @@ def customiseForOffline(process):
     return process
 
 
+# Remove the explicit CUDAService from the HLT configuration, and
+# rely on ProcessAcceleratorCUDA to load it if necessary
+def customizeHLTfor40852(process):
+    if hasattr(process, 'CUDAService'):
+        del process.CUDAService
+
+    return process
+
+
 # CMSSW version specific customizations
 def customizeHLTforCMSSW(process, menuType="GRun"):
 
@@ -219,4 +228,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"):
     # add call to action function in proper order: newest last!
     # process = customiseFor12718(process)
 
+    process = customizeHLTfor40852(process)
+
     return process