diff --git a/Utils.h b/Utils.h
index 5bb2855..4c0114a 100644
--- a/Utils.h
+++ b/Utils.h
@@ -34,7 +34,7 @@
 namespace android {
 namespace vold {
 
-static const char* kPropFuseSnapshot = "sys.fuse_snapshot";
+static const char* kPropFuse = "persist.sys.fuse";
 
 /* SELinux contexts used depending on the block device type */
 extern security_context_t sBlkidContext;
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index f1cd232..8b9c29c 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -374,7 +374,7 @@
 }
 
 int VolumeManager::linkPrimary(userid_t userId) {
-    if (!GetBoolProperty(android::vold::kPropFuseSnapshot, false)) {
+    if (!GetBoolProperty(android::vold::kPropFuse, false)) {
         std::string source(mPrimary->getPath());
         if (mPrimary->isEmulated()) {
             source = StringPrintf("%s/%d", source.c_str(), userId);
@@ -468,7 +468,7 @@
         createEmulatedVolumesForUser(userId);
     }
 
-    if (!GetBoolProperty(android::vold::kPropFuseSnapshot, false)) {
+    if (!GetBoolProperty(android::vold::kPropFuse, false)) {
         // Note that sometimes the system will spin up processes from Zygote
         // before actually starting the user, so we're okay if Zygote
         // already created this directory.
@@ -563,7 +563,7 @@
 }
 
 int VolumeManager::remountUid(uid_t uid, int32_t mountMode) {
-    if (GetBoolProperty(android::vold::kPropFuseSnapshot, false)) {
+    if (GetBoolProperty(android::vold::kPropFuse, false)) {
         // TODO(135341433): Implement fuse specific logic.
         return 0;
     }
diff --git a/model/EmulatedVolume.cpp b/model/EmulatedVolume.cpp
index b42bd49..d1940f0 100644
--- a/model/EmulatedVolume.cpp
+++ b/model/EmulatedVolume.cpp
@@ -132,7 +132,7 @@
 
     dev_t before = GetDevice(mSdcardFsFull);
 
-    bool isFuse = base::GetBoolProperty(kPropFuseSnapshot, false);
+    bool isFuse = base::GetBoolProperty(kPropFuse, false);
 
     // Mount sdcardfs regardless of FUSE, since we need it to bind-mount on top of the
     // FUSE volume for various reasons.
diff --git a/model/PublicVolume.cpp b/model/PublicVolume.cpp
index b9164f5..78f150d 100644
--- a/model/PublicVolume.cpp
+++ b/model/PublicVolume.cpp
@@ -223,7 +223,7 @@
     /* sdcardfs will have exited already. The filesystem will still be running */
     TEMP_FAILURE_RETRY(waitpid(sdcardFsPid, nullptr, 0));
 
-    bool isFuse = base::GetBoolProperty(kPropFuseSnapshot, false);
+    bool isFuse = base::GetBoolProperty(kPropFuse, false);
     if (isFuse) {
         // We need to mount FUSE *after* sdcardfs, since the FUSE daemon may depend
         // on sdcardfs being up.
