diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index d7aa300f2..f74488bb7 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -4136,6 +4136,12 @@ class AttributeStopWatch extends AttributeDefinition
 		return $this->Get('states');
 	}
 
+	public function AlwaysLoadInTables()
+	{
+		// Each and every stop watch is accessed for computing the highlight code (DBObject::GetHighlightCode())
+		return true;
+	}
+
 	/**
 	 * Construct a brand new (but configured) stop watch
 	 */