diff --git a/src/rtps_reader.vhd b/src/rtps_reader.vhd
index 3ed3acd..54c6359 100644
--- a/src/rtps_reader.vhd
+++ b/src/rtps_reader.vhd
@@ -604,13 +604,8 @@ begin
                                 mem_op_start    <= '1';
                                 mem_opcode      <= SEARCH_ENDPOINT;
                                 mem_field_flags <= (others => '0');
-                                -- Synthesis Guard
-                                if (RELIABILITY_QOS = RELIABLE_RELIABILITY_QOS) then
-                                    stage_next      <= LATCH_ENDPOINT_DATA;
-                                    cnt_next        <= 0;
-                                else
-                                    stage_next  <= METATRAFFIC_OPERATION;
-                                end if;
+                                stage_next      <= LATCH_ENDPOINT_DATA;
+                                cnt_next        <= 0;
                             when EMO_ENDPOINT_UNMATCH =>
                                 mem_op_start    <= '1';
                                 mem_opcode      <= SEARCH_ENDPOINT;
@@ -657,28 +652,25 @@ begin
                     end if;
                 end if;
             when LATCH_ENDPOINT_DATA =>
-                -- Synthesis Guard
-                if (RELIABILITY_QOS = RELIABLE_RELIABILITY_QOS) then
-                    -- Input FIFO Guard
-                    if (empty_meta = '0') then
-                        rd_meta     <= '1';
-                        
-                        case (cnt) is
-                            -- IPv4 Address
-                            when 0 =>
-                                addr_next   <= data_in_meta;
-                                cnt_next    <= cnt + 1;
-                            -- UDP Port
-                            when 1 =>
-                                --assert (last_word_in_meta = '1') report "last_word_in_meta not set" severity FAILURE;
-                                
-                                portn_next  <= data_in_meta(WORD_WIDTH-1 downto WORD_WIDTH-UDP_PORT_WIDTH);
-                                
-                                stage_next  <= METATRAFFIC_OPERATION;
-                            when others =>
-                                null;
-                        end case;
-                    end if;
+                -- Input FIFO Guard
+                if (empty_meta = '0') then
+                    rd_meta     <= '1';
+                    
+                    case (cnt) is
+                        -- IPv4 Address
+                        when 0 =>
+                            addr_next   <= data_in_meta;
+                            cnt_next    <= cnt + 1;
+                        -- UDP Port
+                        when 1 =>
+                            --assert (last_word_in_meta = '1') report "last_word_in_meta not set" severity FAILURE;
+                            
+                            portn_next  <= data_in_meta(WORD_WIDTH-1 downto WORD_WIDTH-UDP_PORT_WIDTH);
+                            
+                            stage_next  <= METATRAFFIC_OPERATION;
+                        when others =>
+                            null;
+                    end case;
                 end if;
             when METATRAFFIC_OPERATION =>
                 -- Memory Operation Guard