diff --git a/rtl/system_integration/neorv32_vivado_ip.vhd b/rtl/system_integration/neorv32_vivado_ip.vhd
index c06228390..d63f4ed1c 100644
--- a/rtl/system_integration/neorv32_vivado_ip.vhd
+++ b/rtl/system_integration/neorv32_vivado_ip.vhd
@@ -354,7 +354,6 @@ begin
   generic map (
     -- Clocking --
     CLOCK_FREQUENCY       => CLOCK_FREQUENCY,
-    CLOCK_GATING_EN       => false, -- clock gating is not supported here
     -- Identification --
     HART_ID               => std_ulogic_vector(HART_ID),
     JEDEC_ID              => std_ulogic_vector(JEDEC_ID),
@@ -388,6 +387,7 @@ begin
     RISCV_ISA_Zksh        => RISCV_ISA_Zksh,
     RISCV_ISA_Zxcfu       => RISCV_ISA_Zxcfu,
     -- Extension Options --
+    CLOCK_GATING_EN       => false, -- clock gating is not supported here
     FAST_MUL_EN           => FAST_MUL_EN,
     FAST_SHIFT_EN         => FAST_SHIFT_EN,
     REGFILE_HW_RST        => REGFILE_HW_RST,
diff --git a/sim/neorv32_tb.vhd b/sim/neorv32_tb.vhd
index c51053b4e..26a6595f2 100644
--- a/sim/neorv32_tb.vhd
+++ b/sim/neorv32_tb.vhd
@@ -109,7 +109,6 @@ begin
   generic map (
     -- Clocking --
     CLOCK_FREQUENCY       => CLOCK_FREQUENCY,
-    CLOCK_GATING_EN       => true,
     -- Identification --
     HART_ID               => x"00000000",
     JEDEC_ID              => "00000000000",
@@ -143,6 +142,7 @@ begin
     RISCV_ISA_Zmmul       => RISCV_ISA_Zmmul,
     RISCV_ISA_Zxcfu       => RISCV_ISA_Zxcfu,
     -- Extension Options --
+    CLOCK_GATING_EN       => true,
     FAST_MUL_EN           => FAST_MUL_EN,
     FAST_SHIFT_EN         => FAST_SHIFT_EN,
     REGFILE_HW_RST        => REGFILE_HW_RST,