diff --git a/bdaq53/chips/rd53a.py b/bdaq53/chips/rd53a.py
index b12a9a38be7913543e5ce522021aa2f85c817e77..92f8c46dbbc65815cbb3877b7ed7cc1823b32318 100644
--- a/bdaq53/chips/rd53a.py
+++ b/bdaq53/chips/rd53a.py
@@ -16,7 +16,6 @@ from basil.utils.BitLogic import BitLogic
 from bdaq53.chips.chip_base import ChipBase, RegisterObject, MaskObject
 from bdaq53.analysis import analysis_utils
 from bdaq53.analysis import rd53a_analysis as ana
-from bdaq53 import manage_databases
 from bdaq53.system import logger as logger
 
 FLAVOR_COLS = {'SYNC': range(0, 128),
@@ -505,8 +504,6 @@ class RD53A(ChipBase):
         else:
             raise TypeError('Supplied config has unknown format!')
 
-        manage_databases.check_chip_in_database(self.chip_type, self.chip_sn)
-
         self.registers = RegisterObject(self, 'rd53a_registers.yaml')
 
         masks = {'enable': {'default': False},
diff --git a/bdaq53/system/scan_base.py b/bdaq53/system/scan_base.py
index f18540621fa9738b0ac7b41ae1b55b8809757cab..2bd1fb6fbd669bf1efcdd93289bf6e5f707a6db2 100755
--- a/bdaq53/system/scan_base.py
+++ b/bdaq53/system/scan_base.py
@@ -26,6 +26,7 @@ from slack import WebClient
 from online_monitor.utils import utils as ou
 
 from bdaq53 import utils as bu
+from bdaq53 import manage_databases
 from bdaq53.analysis import analysis_utils as au
 from bdaq53.analysis import module_plotting
 
@@ -581,6 +582,8 @@ class ScanBase(object):
                 else:
                     self.log.error('Chip type %s not supported', self.chip_settings['chip_type'])
                     raise NotImplementedError('Chip type %s not supported', self.chip_settings['chip_type'])
+                if self.configuration['bench']['general'].get('use_database', True):
+                    manage_databases.check_chip_in_database(self.chip_settings['chip_type'], self.chip_settings['chip_sn'])
 
     def _init_files(self):
         for _ in self.iterate_chips():