diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
index 9fc95cf85c6c..43c772826b18 100644
--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
@@ -247,7 +247,8 @@ static void qcom_cc_set_critical(struct device *dev, struct qcom_cc *cc)
 		if (i >= cc->num_rclks)
 			continue;
 
-		cc->rclks[i]->flags |= QCOM_CLK_IS_CRITICAL;
+		if (cc->rclks[i])
+			cc->rclks[i]->flags |= QCOM_CLK_IS_CRITICAL;
 	}
 
 	of_property_for_each_u32(dev->of_node, "qcom,critical-devices", prop, p, i) {
@@ -265,7 +266,8 @@ static void qcom_cc_set_critical(struct device *dev, struct qcom_cc *cc)
 			if (args.np != dev->of_node || clock_idx >= cc->num_rclks)
 				continue;
 
-			cc->rclks[clock_idx]->flags |= QCOM_CLK_IS_CRITICAL;
+			if (cc->rclks[clock_idx])
+				cc->rclks[clock_idx]->flags |= QCOM_CLK_IS_CRITICAL;
 			of_node_put(args.np);
 		}