diff --git a/ipsec-to-dns b/ipsec-to-dns
index 04ad4b8..530c714 100644
--- a/ipsec-to-dns
+++ b/ipsec-to-dns
@@ -16,8 +16,9 @@
 :global PrefixInZone;
 
 :global CharacterReplace;
-:global LogPrintExit2;
+:global EscapeForRegEx;
 :global IfThenElse;
+:global LogPrintExit2;
 
 :local Zone \
   ([ $IfThenElse ($PrefixInZone = true) "ipsec." ] . \
@@ -35,7 +36,8 @@
 :foreach DnsRecord in=[ /ip/dns/static/find where comment ~ $CommentPrefix ] do={
   :local DnsRecordVal [ /ip/dns/static/get $DnsRecord ];
   :local PeerId [ $CharacterReplace ($DnsRecordVal->"comment") $CommentPrefix "" ];
-  :if ([ :len [ /ip/ipsec/active-peers/find where id=$PeerId dynamic-address=($DnsRecordVal->"address") ] ] > 0) do={
+  :if ([ :len [ /ip/ipsec/active-peers/find where id~("^(CN=)?" . [ $EscapeForRegEx $PeerId ] . "\$") \
+       dynamic-address=($DnsRecordVal->"address") ] ] > 0) do={
     $LogPrintExit2 debug $0 ("Peer " . $PeerId . " (" . $DnsRecordVal->"name" . ") still exists. Not deleting DNS entry.") false;
   } else={
     :local Found false;