diff --git a/changelogs/unreleased/350-akhilerm b/changelogs/unreleased/350-akhilerm
new file mode 100644
index 000000000..d63a2ad5a
--- /dev/null
+++ b/changelogs/unreleased/350-akhilerm
@@ -0,0 +1 @@
+add validation to prevent volume deletion if there is a dependent snapshot
\ No newline at end of file
diff --git a/ci/sanity.sh b/ci/sanity.sh
index b49af393e..eed106e06 100755
--- a/ci/sanity.sh
+++ b/ci/sanity.sh
@@ -56,7 +56,7 @@ EOT
 	CSI_TEST_REPO="https://github.com/$test_repo/csi-test.git"
 	CSI_REPO_PATH="$(go env GOPATH)/src/github.com/$test_repo/csi-test"
 	if [ ! -d "$CSI_REPO_PATH" ] ; then
-		git clone -b "v4.0.1" "$CSI_TEST_REPO" "$CSI_REPO_PATH"
+		git clone -b "v4.2.0" "$CSI_TEST_REPO" "$CSI_REPO_PATH"
 	else
 		cd "$CSI_REPO_PATH"
 		git pull "$CSI_REPO_PATH"
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
index 10a306a5f..9f5787d2a 100644
--- a/pkg/driver/controller.go
+++ b/pkg/driver/controller.go
@@ -788,12 +788,12 @@ func (cs *controller) DeleteSnapshot(
 	req *csi.DeleteSnapshotRequest,
 ) (*csi.DeleteSnapshotResponse, error) {
 
-	if req.SnapshotId == "" {
-		return nil, status.Errorf(codes.InvalidArgument, "DeleteSnapshot: empty snapshotID")
-	}
-
 	klog.Infof("DeleteSnapshot request for %s", req.SnapshotId)
 
+	if err := cs.validateDeleteSnapshotReq(req); err != nil {
+		return nil, err
+	}
+
 	// snapshodID is formed as <volname>@<snapname>
 	// parsing them here
 	snapshotID := strings.Split(req.SnapshotId, "@")
@@ -801,7 +801,9 @@ func (cs *controller) DeleteSnapshot(
 		// should succeed when an invalid snapshot id is used
 		return &csi.DeleteSnapshotResponse{}, nil
 	}
-	if err := zfs.DeleteSnapshot(snapshotID[1]); err != nil {
+
+	snapName := snapshotID[1]
+	if err := zfs.DeleteSnapshot(snapName); err != nil {
 		return nil, status.Errorf(
 			codes.Internal,
 			"failed to handle DeleteSnapshot for %s, {%s}",
@@ -954,7 +956,7 @@ func (cs *controller) ListVolumes(
 }
 
 func (cs *controller) validateDeleteVolumeReq(req *csi.DeleteVolumeRequest) error {
-	volumeID := req.GetVolumeId()
+	volumeID := strings.ToLower(req.GetVolumeId())
 	if volumeID == "" {
 		return status.Error(
 			codes.InvalidArgument,
@@ -962,7 +964,29 @@ func (cs *controller) validateDeleteVolumeReq(req *csi.DeleteVolumeRequest) erro
 		)
 	}
 
-	err := cs.validateRequest(
+	// volume should not be deleted if there are snapshots present for the volume
+	snapList, err := zfs.GetSnapshotsForVolume(volumeID)
+	if err != nil {
+		return status.Errorf(
+			codes.NotFound,
+			"failed to handle delete volume request for {%s}, "+
+				"validation failed checking for snapshots. Error: %s",
+			req.GetVolumeId(),
+			err.Error(),
+		)
+	}
+
+	// delete is not supported if there are any snapshots present for the volume
+	if len(snapList.Items) != 0 {
+		return status.Errorf(
+			codes.Internal,
+			"failed to handle delete volume request for {%s} with %d snapshots",
+			req.GetVolumeId(),
+			len(snapList.Items),
+		)
+	}
+
+	err = cs.validateRequest(
 		csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
 	)
 	if err != nil {
@@ -975,6 +999,14 @@ func (cs *controller) validateDeleteVolumeReq(req *csi.DeleteVolumeRequest) erro
 	return nil
 }
 
+func (cs *controller) validateDeleteSnapshotReq(req *csi.DeleteSnapshotRequest) error {
+	if req.GetSnapshotId() == "" {
+		return status.Errorf(codes.InvalidArgument, "DeleteSnapshot: empty snapshotID")
+	}
+
+	return nil
+}
+
 // IsSupportedVolumeCapabilityAccessMode valides the requested access mode
 func IsSupportedVolumeCapabilityAccessMode(
 	accessMode csi.VolumeCapability_AccessMode_Mode,
diff --git a/pkg/zfs/volume.go b/pkg/zfs/volume.go
index 3055be9a7..47ba4532b 100644
--- a/pkg/zfs/volume.go
+++ b/pkg/zfs/volume.go
@@ -299,6 +299,15 @@ func GetZFSSnapshot(snapID string) (*apis.ZFSSnapshot, error) {
 	return snap, err
 }
 
+// GetSnapshotsForVolume fetches all the snapshots for the given volume
+func GetSnapshotsForVolume(volumeID string) (*apis.ZFSSnapshotList, error) {
+	listOptions := metav1.ListOptions{
+		LabelSelector: ZFSVolKey + "=" + volumeID,
+	}
+	snapList, err := snapbuilder.NewKubeclient().WithNamespace(OpenEBSNamespace).List(listOptions)
+	return snapList, err
+}
+
 // GetZFSSnapshotStatus returns ZFSSnapshot status
 func GetZFSSnapshotStatus(snapID string) (string, error) {
 	getOptions := metav1.GetOptions{}