diff --git a/submodules/TextFormat/Sources/GenerateTextEntities.swift b/submodules/TextFormat/Sources/GenerateTextEntities.swift
index e6ed9b7734..862e92c82a 100644
--- a/submodules/TextFormat/Sources/GenerateTextEntities.swift
+++ b/submodules/TextFormat/Sources/GenerateTextEntities.swift
@@ -22,12 +22,11 @@ private let identifierDelimiterSet: CharacterSet = {
     var set = CharacterSet.punctuationCharacters
     set.formUnion(CharacterSet.whitespacesAndNewlines)
     set.insert("|")
+    set.insert("/")
     return set
 }()
 private let externalIdentifierDelimiterSet: CharacterSet = {
-    var set = CharacterSet.punctuationCharacters
-    set.formUnion(CharacterSet.whitespacesAndNewlines)
-    set.insert("|")
+    var set = identifierDelimiterSet
     set.remove(".")
     return set
 }()
@@ -196,8 +195,10 @@ public func generateTextEntities(_ text: String, enabledTypes: EnabledEntityType
         if let scalar = scalar {
             if scalar == "/" {
                 notFound = false
-                if previousScalar != nil && !delimiterSet.contains(previousScalar!) {
-                    currentEntity = nil
+                if let previousScalar = previousScalar, !delimiterSet.contains(previousScalar) {
+                    if let entity = currentEntity, entity.0 == .command {
+                        currentEntity = nil
+                    }
                 } else {
                     if let (type, range) = currentEntity {
                         commitEntity(utf16, type, range, enabledTypes, &entities)