diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 08af6013..9934ef4c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -129,7 +129,7 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 BOARD_USES_SWIFTSHADER := false
 
 # This should be the same value as USE_ANGLE in device.mk
-BOARD_USES_ANGLE := true
+BOARD_USES_ANGLE := false
 
 # Gralloc4
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
diff --git a/device.mk b/device.mk
index a9597b70..1ae73acb 100644
--- a/device.mk
+++ b/device.mk
@@ -184,7 +184,7 @@ endif
 USE_SWIFTSHADER := false
 
 # Must match BOARD_USES_ANGLE in BoardConfig.mk
-USE_ANGLE := true
+USE_ANGLE := false
 
 # HWUI
 TARGET_USES_VULKAN = true