diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go
index 3e6c30a0d..a4430f08a 100644
--- a/internal/rbd/nodeserver.go
+++ b/internal/rbd/nodeserver.go
@@ -649,6 +649,8 @@ func (ns *NodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 			util.ExtendedLog(ctx, "failed to unmount targetPath: %s with error: %v", stagingTargetPath, err)
 			return nil, status.Error(codes.Internal, err.Error())
 		}
+		util.DebugLog(ctx, "successfully unmounted volume (%s) from staging path (%s)",
+			req.GetVolumeId(), stagingTargetPath)
 	}
 
 	if err = os.Remove(stagingTargetPath); err != nil {
@@ -687,8 +689,7 @@ func (ns *NodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	util.DebugLog(ctx, "successfully unmounted volume (%s) from staging path (%s)",
-		req.GetVolumeId(), stagingTargetPath)
+	util.DebugLog(ctx, "successfully unmapped volume (%s)", req.GetVolumeId())
 
 	if err = cleanupRBDImageMetadataStash(stagingParentPath); err != nil {
 		util.ErrorLog(ctx, "failed to cleanup image metadata stash (%v)", err)