diff --git a/Allwmake b/Allwmake
index 992d433bf3..9e1c942043 100755
--- a/Allwmake
+++ b/Allwmake
@@ -73,10 +73,10 @@ echo
 applications/Allwmake $targetType $*
 
 # Additional components/modules
-if [ "$FOAM_MODULE_PREFIX" = false ]
+if [ "$FOAM_MODULE_PREFIX" = false ] || [ "$FOAM_MODULE_PREFIX" = none ]
 then
     echo "========================================"
-    echo "OpenFOAM modules disabled (prefix=false)"
+    echo "OpenFOAM modules disabled (prefix=${FOAM_MODULE_PREFIX})"
     echo
 elif [ -d "$WM_PROJECT_DIR/modules" ]
 then
diff --git a/modules/Allwmake b/modules/Allwmake
index b6bf9301a5..a5a481bffd 100755
--- a/modules/Allwmake
+++ b/modules/Allwmake
@@ -12,7 +12,13 @@ targetType=libso
 export FOAM_MODULE_PREFIX
 
 echo "========================================"
-echo "Compile OpenFOAM modules"
+if [ "$FOAM_MODULE_PREFIX" = false ] || [ "$FOAM_MODULE_PREFIX" = none ]
+then
+    echo "OpenFOAM modules disabled (prefix=${FOAM_MODULE_PREFIX})"
+    echo
+    exit 0
+fi
+
 echo "prefix = $FOAM_MODULE_PREFIX"
 echo
 echo "    ignoring possible compilation errors"
diff --git a/wmake/scripts/AllwmakeParseArguments b/wmake/scripts/AllwmakeParseArguments
index 0a29e26ac0..a7333dc57b 100644
--- a/wmake/scripts/AllwmakeParseArguments
+++ b/wmake/scripts/AllwmakeParseArguments
@@ -120,8 +120,8 @@ do
         # Prefix: openfoam (other)
         (o | openfoam)  FOAM_MODULE_PREFIX="${FOAM_LIBBIN%/*}" ;;
 
-        # Prefix: false (ie, 'disabled')
-        (false) FOAM_MODULE_PREFIX=false ;;
+        # Prefix: false | none (ie, 'disabled')
+        (false | none)  FOAM_MODULE_PREFIX=false ;;
 
         # Prefix: directory (absolute or relative)
         (*)
diff --git a/wmake/scripts/wmakeFunctions b/wmake/scripts/wmakeFunctions
index a5e310c1e1..c228ba5cad 100644
--- a/wmake/scripts/wmakeFunctions
+++ b/wmake/scripts/wmakeFunctions
@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2015-2016 OpenFOAM Foundation
-#     Copyright (C) 2018-2020 OpenCFD Ltd.
+#     Copyright (C) 2018-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -71,8 +71,8 @@ setModulePrefix()
     # Prefix: openfoam (other)
     (o | openfoam)  FOAM_MODULE_PREFIX="${FOAM_LIBBIN%/*}" ;;
 
-    # Prefix: false (ie, 'disabled')
-    (false) FOAM_MODULE_PREFIX=false ;;
+    # Prefix: false | none (ie, 'disabled')
+    (false | none)  FOAM_MODULE_PREFIX=false ;;
 
     # Prefix: directory (absolute or relative)
     (*)