diff --git a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
index 865ad4c9fb9..825cccd59ce 100644
--- a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
+++ b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
@@ -18,11 +18,11 @@
 
 shader node_ambient_occlusion(
 	color ColorIn = color(1.0, 1.0, 1.0),
-	int samples = 8,
+	int samples = 16,
 	float Distance = 1.0,
 	normal Normal = N,
 	int inside = 0,
-	int only_local = 1,
+	int only_local = 0,
 	output color ColorOut = color(1.0, 1.0, 1.0),
 	output float AO = 1.0)
 {
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 2464fcae069..601d72c4b1b 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -2795,14 +2795,14 @@ NODE_DEFINE(AmbientOcclusionNode)
 {
 	NodeType* type = NodeType::add("ambient_occlusion", create, NodeType::SHADER);
 
-	SOCKET_INT(samples, "Samples", 8);
+	SOCKET_INT(samples, "Samples", 16);
 
 	SOCKET_IN_COLOR(color, "Color", make_float3(1.0f, 1.0f, 1.0f));
 	SOCKET_IN_FLOAT(distance, "Distance", 1.0f);
 	SOCKET_IN_NORMAL(normal, "Normal", make_float3(0.0f, 0.0f, 0.0f), SocketType::LINK_NORMAL);
 
 	SOCKET_BOOLEAN(inside, "Inside", false);
-	SOCKET_BOOLEAN(only_local, "Only Local", true);
+	SOCKET_BOOLEAN(only_local, "Only Local", false);
 
 	SOCKET_OUT_COLOR(color, "Color");
 	SOCKET_OUT_FLOAT(ao, "AO");
diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
index b2b1bd3b6a7..995ff0cfd40 100644
--- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
+++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
@@ -49,8 +49,8 @@ static int node_shader_gpu_ambient_occlusion(GPUMaterial *mat, bNode *UNUSED(nod
 
 static void node_shader_init_ambient_occlusion(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1 = 8; /* samples */
-	node->custom2 = SHD_AO_LOCAL;
+	node->custom1 = 16; /* samples */
+	node->custom2 = 0;
 }
 
 /* node type definition */