diff --git a/bdaq53/manage_databases.py b/bdaq53/manage_databases.py
index 488672c044b09cb1a35f86bfb8da7f06a64a8638..4e51f7d8d822fd83fe28e5f99fc2964daec6c8ee 100644
--- a/bdaq53/manage_databases.py
+++ b/bdaq53/manage_databases.py
@@ -225,7 +225,8 @@ def check_chip_in_database(chip_type, chip_sn):
     '''
 
     if chip_type != 'rd53a':
-        raise NotImplementedError('This functionality is not yet implement for {}'. format(chip_type))
+        log.warning('Database lookup activated, but not available for {}...'.format(chip_type))
+        return
 
     log.info('Checking database for chip {}...'.format(chip_sn))