diff --git a/orientdb/defaults/main.yml b/orientdb/defaults/main.yml
index b5462b6f..b48eee88 100644
--- a/orientdb/defaults/main.yml
+++ b/orientdb/defaults/main.yml
@@ -55,6 +55,8 @@ orientdb_distributed_readyourwrites: 'true'
 orientdb_distributed_executionmode: 'undefined'
 orientdb_new_node_strategy: 'dynamic'
 
+orientbd_graph_server_enabled: False
+
 orientdb_hazelcast_group_name: orientdb
 orientdb_hazelcast_group_password: orientdb
 orientbd_hazelcast_encryption: False
diff --git a/orientdb/templates/orientdb-server-config.xml.j2 b/orientdb/templates/orientdb-server-config.xml.j2
index 77cf25e0..279ae387 100644
--- a/orientdb/templates/orientdb-server-config.xml.j2
+++ b/orientdb/templates/orientdb-server-config.xml.j2
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <orient-server>
     <handlers>
-	<handler class="com.orientechnologies.orient.graph.handler.OGraphServerHandler">
-		<parameters>
-			<parameter value="true" name="enabled"/>
-			<parameter value="50" name="graph.pool.max"/>
-		</parameters>
-	</handler>
+    	{% if orientbd_graph_server_enabled %}
+		<handler class="com.orientechnologies.tinkerpop.handler.OGraphServerHandler">
+            <parameters>
+                <parameter name="enabled" value="true"/>
+                <parameter name="graph.pool.max" value="50"/>
+            </parameters>
+        </handler>
+        {% endif %}
         <handler class="com.orientechnologies.orient.server.hazelcast.OHazelcastPlugin">
             <parameters>
                 <parameter value="{{ orientdb_distributed | ternary('true','false') }}" name="enabled"/>
@@ -102,7 +104,8 @@
         <entry value="1" name="db.pool.min"/>
         <entry value="50" name="db.pool.max"/>
         <entry value="50" name="script.pool.maxSize"/>
-        <entry value="true" name="profiler.enabled"/>
+        <!-- Profile is available in enterprise edition only http://orientdb.com/docs/3.0.x/tuning/Profiler.html -->
+        <entry value="false" name="profiler.enabled"/> 
         <entry value="0" name="distributed.autoRemoveOfflineServers"/>
         <entry value="{{ orientdb_data_dir }}" name="server.database.path" />
     </properties>