diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdc88960..cda65cf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Project website: https://github.com/mviereck/x11docker
 ## [Unreleased]
 ### Added
  - WSL2 support. See also option `--mobyvm`.
+   [(#214)](https://github.com/mviereck/x11docker/issues/214)
  - `--mobyvm`: New option to use MobyVM in WSL2. 
    Default for WSL2 is native linux docker.
  - `--shell`: New option to specify preferred user shell.
diff --git a/x11docker b/x11docker
index 0b673119..755fb057 100755
--- a/x11docker
+++ b/x11docker
@@ -2186,10 +2186,12 @@ check_xdepends() {              # check dependencies on host for X server option
         $Message "${1:-} not supported with --runtime=kata-runtime"
         Return=1
       }
-      [ "$Winsubsystem" ] && {
-        $Message "${1:-} not supported on MS Windows."
-        Return=1
-      }
+      case $Mobyvm in
+        yes)
+          $Message "${1:-} not supported with MobyVM / docker-for-win"
+          Return=1
+        ;;
+      esac
     ;;
   esac
   case ${1:-} in
@@ -2486,8 +2488,8 @@ check_xserver() {               # check chosen X server, auto-choose X server
   [ -z "$Xoverip" ] && {
     [ "$Runtime" = "kata-runtime" ] && Xoverip="yes"
     [ "$Runsinsnap" = "yes" ]       && Xoverip="yes"
-    case $Winsubsystem in
-      MSYS2|CYGWIN|WSL1|WSL2)          Xoverip="yes" ;;
+    case $Mobyvm in
+      yes)                             Xoverip="yes" ;;
     esac
     [ "$Xoverip" = "yes" ] && [ "$Autochooseserver" = "no" ] && note "Enabled X over TCP instead of sharing unix socket."
   }