diff --git a/test_pool/clock/test_c017.c b/test_pool/clock/test_c017.c
index a586148bb99122d5154c35d1f7d130ecfbf8daa9..f4b9e0db104c1be660212f7cf0d3bc1db85d04b0 100644
--- a/test_pool/clock/test_c017.c
+++ b/test_pool/clock/test_c017.c
@@ -1,5 +1,5 @@
 /** @file
- * Copyright (c) 2020-2024, Arm Limited or its affiliates. All rights reserved.
+ * Copyright (c) 2020-2025, Arm Limited or its affiliates. All rights reserved.
  * SPDX-License-Identifier : Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -79,6 +79,7 @@ uint32_t clock_config_set_check(uint32_t version)
         run_flag = 1;
         /* Find new attribute from previously stored value */
         attributes = val_clock_get_info(CLOCK_ATTRIBUTE, clock_id);
+        attributes = attributes & CLOCK_ATTRIBUTES_STATE_MASK;
         if ((attributes & 0x1) == CONFIG_SET_DISABLE)
             attributes = CONFIG_SET_ENABLE;
         else
diff --git a/val/include/val_clock.h b/val/include/val_clock.h
index 457639936b0b6c2f38f8019e215907b3d1adbc8e..01004e03d2ee2acb4fd0e43fa864284b7ced912a 100644
--- a/val/include/val_clock.h
+++ b/val/include/val_clock.h
@@ -1,5 +1,5 @@
 /** @file
- * Copyright (c) 2019-2020, 2023-2024, Arm Limited or its affiliates. All rights reserved.
+ * Copyright (c) 2019-2020, 2023-2025, Arm Limited or its affiliates. All rights reserved.
  * SPDX-License-Identifier : Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -53,7 +53,7 @@
 #define CLOCK_RATE_FMT_STEP_SIZE           0x1
 #define CLOCK_DUTY_CYCLE_EXT_CONFIG        0x1
 #define CLOCK_PHASE_EXT_CONFIG             0x2
-
+#define CLOCK_ATTRIBUTES_STATE_MASK        0x1
 
 #define MAX_NUM_OF_CLOCKS 10