diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
index ae600ab1a646..d40755a0984b 100644
--- a/fs/nfs/pnfs_nfs.c
+++ b/fs/nfs/pnfs_nfs.c
@@ -221,7 +221,7 @@ pnfs_generic_alloc_ds_commits(struct nfs_commit_info *cinfo,
 		 * If the layout segment is invalid, then let
 		 * pnfs_generic_retry_commit() clean up the bucket.
 		 */
-		if (!pnfs_is_valid_lseg(bucket->clseg) &&
+		if (bucket->clseg && !pnfs_is_valid_lseg(bucket->clseg) &&
 		    !test_bit(NFS_LSEG_LAYOUTRETURN, &bucket->clseg->pls_flags))
 			break;
 		data = nfs_commitdata_alloc(false);