diff --git a/src/lib/data/PersistentStorage.cpp b/src/lib/data/PersistentStorage.cpp
index 619dfdda..9c8fa04d 100644
--- a/src/lib/data/PersistentStorage.cpp
+++ b/src/lib/data/PersistentStorage.cpp
@@ -121,7 +121,10 @@ void PersistentStorage::addSourceLocation(
 
 void PersistentStorage::addComponentAccess(Id nodeId , int type)
 {
-	m_sqliteStorage.addComponentAccess(nodeId, type);
+	if (m_sqliteStorage.getComponentAccessByNodeId(nodeId).nodeId == 0)
+	{
+		m_sqliteStorage.addComponentAccess(nodeId, type);
+	}
 }
 
 void PersistentStorage::addCommentLocation(Id fileNodeId, uint startLine, uint startCol, uint endLine, uint endCol)
diff --git a/src/lib/data/graph/Node.cpp b/src/lib/data/graph/Node.cpp
index 4bc445c8..94d1af95 100644
--- a/src/lib/data/graph/Node.cpp
+++ b/src/lib/data/graph/Node.cpp
@@ -440,7 +440,7 @@ void Node::addComponentAccess(std::shared_ptr<TokenComponentAccess> component)
 {
 	if (getComponent<TokenComponentAccess>())
 	{
-		LOG_ERROR("TokenComponentAccess has been set before!");
+		LOG_WARNING("TokenComponentAccess has been set before!");
 		return;
 	}
 	else