diff --git a/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/ATLAS_CHECK_THREAD_SAFETY b/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..ce7d7f59e084fb5298f47f66b9712cd8ccc204e0
--- /dev/null
+++ b/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+DetectorDescription/GeoModel/GeoModelInterfaces
diff --git a/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/IGeoModelTool.h b/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/IGeoModelTool.h
index 307d858b20dba55a69db3a041515800832a52530..46c218a606758308ed6311d83f66f1fe9b634d64 100755
--- a/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/IGeoModelTool.h
+++ b/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/IGeoModelTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef GEOMODELINTERFACES_IGEOMODELTOOL_H
@@ -7,6 +7,7 @@
 
 #include "GaudiKernel/IAlgTool.h"
 #include "AthenaKernel/IOVSvcDefs.h"
+#include "CxxUtils/checker_macros.h"
 
 static const InterfaceID IID_IGeoModelTool( "IGeoModelTool", 1, 0 );
 
@@ -25,7 +26,7 @@ public:
     virtual StatusCode clear() = 0;
 
     // Register callback function on ConDB object
-    virtual StatusCode registerCallback() = 0;
+    virtual StatusCode registerCallback ATLAS_NOT_THREAD_SAFE () = 0;
 
     // Callback function itself
     virtual StatusCode align(IOVSVC_CALLBACK_ARGS) = 0;