diff --git a/common-hooks/storage-class-change/hook.go b/common-hooks/storage-class-change/hook.go
index d9f59876..09075906 100644
--- a/common-hooks/storage-class-change/hook.go
+++ b/common-hooks/storage-class-change/hook.go
@@ -344,7 +344,10 @@ func calculateEffectiveStorageClass(input *pkg.HookInput, args Args, currentStor
 	var configValuesPath = fmt.Sprintf("%s.storageClass", args.ModuleName)
 
 	if args.D8ConfigStorageClassParamName != "" {
-		configValuesPath = fmt.Sprintf("%s.%s", args.ModuleName, args.D8ConfigStorageClassParamName)
+		path := fmt.Sprintf("%s.%s", args.ModuleName, args.D8ConfigStorageClassParamName)
+		if input.ConfigValues.Exists(path) {
+			configValuesPath = path
+		}
 	}
 
 	if input.ConfigValues.Exists(configValuesPath) {