diff --git a/kernel/model/blockial.go b/kernel/model/blockial.go
index 63e3c7e15..64575b010 100644
--- a/kernel/model/blockial.go
+++ b/kernel/model/blockial.go
@@ -138,7 +138,9 @@ func setNodeAttrs(node *ast.Node, tree *parse.Tree, nameValues map[string]string
 	pushBroadcastAttrTransactions(oldAttrs, node)
 
 	go func() {
-		sql.WaitForWritingDatabase()
+		if !sql.IsEmptyQueue() {
+			sql.WaitForWritingDatabase()
+		}
 		refreshDynamicRefText(node, tree)
 	}()
 	return