diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
index 489f12b7fc0f..6348cac7dcc9 100644
--- a/module/zfs/zfs_vfsops.c
+++ b/module/zfs/zfs_vfsops.c
@@ -1785,8 +1785,17 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
 	 * Evict cached data. We must write out any dirty data before
 	 * disowning the dataset.
 	 */
-	if (!zfs_is_readonly(zfsvfs))
+	objset_t *os = zfsvfs->z_os;
+	boolean_t os_dirty = B_FALSE;
+	for (int t = 0; t < TXG_SIZE; t++) {
+		if (dmu_objset_is_dirty(os, t)) {
+			os_dirty = B_TRUE;
+			break;
+		}
+	}
+	if (!zfs_is_readonly(zfsvfs) && os_dirty) {
 		txg_wait_synced(dmu_objset_pool(zfsvfs->z_os), 0);
+	}
 	dmu_objset_evict_dbufs(zfsvfs->z_os);
 
 	return (0);