diff --git a/fs/Ext4.cpp b/fs/Ext4.cpp
index adb8f2e..0cf4f9e 100644
--- a/fs/Ext4.cpp
+++ b/fs/Ext4.cpp
@@ -38,6 +38,7 @@
 #define LOG_TAG "Vold"
 
 #include <android-base/logging.h>
+#include <android-base/properties.h>
 #include <android-base/stringprintf.h>
 #include <cutils/log.h>
 #include <cutils/properties.h>
@@ -176,7 +177,10 @@
     cmd.push_back("-M");
     cmd.push_back(target);
 
-    std::string options("has_journal,quota");
+    std::string options("has_journal");
+    if (android::base::GetBoolProperty("vold.has_quota", false)) {
+        options += ",quota";
+    }
     if (e4crypt_is_native()) {
         options += ",encrypt";
     }