diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index d57d453aecc2d1a37d7d88729c94e0b0a056b786..b7cac07fe0c804e1d162ccc1be3afb87603b2394 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -160,6 +160,9 @@ struct vfsmount *nfs_d_automount(struct path *path)
 	if (IS_ERR(mnt))
 		goto out;
 
+	if (nfs_mountpoint_expiry_timeout < 0)
+		goto out;
+
 	mntget(mnt); /* prevent immediate expiration */
 	mnt_set_expiry(mnt, &nfs_automount_list);
 	schedule_delayed_work(&nfs_automount_task, nfs_mountpoint_expiry_timeout);