diff --git a/adb/services.cpp b/adb/services.cpp
index 0b0c161..9e40bd3 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -84,6 +84,16 @@
             return;
         }
 
+        int root_access = android::base::GetIntProperty("persist.sys.root_access", 0);
+        std::string build_type = android::base::GetProperty("ro.build.type", "");
+
+        if (build_type != "eng" && (root_access & 2) != 2) {
+            WriteFdExactly(fd, "root access is disabled by system setting - "
+                    "enable in Settings -> System -> Developer options\n");
+            adb_close(fd);
+            return;
+        }
+
         android::base::SetProperty("service.adb.root", "1");
         WriteFdExactly(fd, "restarting adbd as root\n");
         adb_close(fd);