diff --git a/src/addr_decode_dync.sv b/src/addr_decode_dync.sv
index 03d19808..37f70083 100644
--- a/src/addr_decode_dync.sv
+++ b/src/addr_decode_dync.sv
@@ -146,7 +146,7 @@ module addr_decode_dync #(
   // check_start:        Enforces a smaller start than end address.
   // check_idx:          Enforces a valid index in the rule.
   // check_overlap:      Warns if there are overlapping address regions.
-  always @(addr_map_i or config_ongoing_i) #0 begin : proc_check_addr_map
+  always_comb begin : proc_check_addr_map
     if (!$isunknown(addr_map_i) && ~config_ongoing_i) begin
       for (int unsigned i = 0; i < NoRules; i++) begin
         check_start : assume (Napot || addr_map_i[i].start_addr < addr_map_i[i].end_addr ||
diff --git a/src/multiaddr_decode.sv b/src/multiaddr_decode.sv
index a6589b76..61466eab 100644
--- a/src/multiaddr_decode.sv
+++ b/src/multiaddr_decode.sv
@@ -133,7 +133,7 @@ module multiaddr_decode #(
 
   // These following assumptions check the validity of the address map.
   // check_idx: Enforces a valid index in the rule.
-  always @(addr_map_i) #0 begin : proc_check_addr_map
+  always_comb begin : proc_check_addr_map
     if (!$isunknown(addr_map_i)) begin
       for (int unsigned i = 0; i < NoRules; i++) begin
         // check the SLV ids