diff --git a/common/firmware/hdl/LinkMonitorInterface.vhd b/common/firmware/hdl/LinkMonitorInterface.vhd
index 56cd2ec3d41de16194ff16d9dd6e13fd2a39896b..7a83fba474ea6af397af5982fd9c8bc716627b02 100644
--- a/common/firmware/hdl/LinkMonitorInterface.vhd
+++ b/common/firmware/hdl/LinkMonitorInterface.vhd
@@ -48,9 +48,16 @@ architecture Behavorial of LinkMonitorInterface is
 begin
 
     -- Buffer input
-    stubs_internal <= stubs;
-    headers_internal <= headers;
-    header_start_internal <= header_start;
+    --==============================--
+    pBuffer : process(clk_p)
+    --==============================--
+    begin
+        if rising_edge(clk_p) then
+            stubs_internal <= stubs;
+            headers_internal <= headers;
+            header_start_internal <= header_start;
+        end if;
+    end process pBuffer;
 
     --==============================--
     -- IPBus fabric