diff --git a/templates/orientdb-server-config.xml.j2 b/templates/orientdb-server-config.xml.j2
index 213e14a..6c0eadf 100644
--- a/templates/orientdb-server-config.xml.j2
+++ b/templates/orientdb-server-config.xml.j2
@@ -9,14 +9,14 @@
             </parameters>
         </handler>
         {% endif %}
-        <handler class="com.orientechnologies.orient.server.hazelcast.OHazelcastPlugin">
+        <!--handler class="com.orientechnologies.orient.server.hazelcast.OHazelcastPlugin">
             <parameters>
                 <parameter value="{{ orientdb_distributed | ternary('true','false') }}" name="enabled"/>
                 <parameter value="{{ ansible_hostname }}" name="nodeName"/>
                 <parameter value="${ORIENTDB_HOME}/config/default-distributed-db-config.json" name="configuration.db.default"/>
                 <parameter value="${ORIENTDB_HOME}/config/hazelcast.xml" name="configuration.hazelcast"/>
             </parameters>
-        </handler>
+        </handler-->
         <handler class="com.orientechnologies.orient.server.handler.OJMXPlugin">
             <parameters>
                 <parameter value="false" name="enabled"/>
@@ -106,7 +106,7 @@
         <entry value="50" name="script.pool.maxSize"/>
         <!-- 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="0" name="distributed.autoRemoveOfflineServers"/ -->
         <entry value="{{ orientdb_data_dir }}" name="server.database.path" />
     </properties>
     <hooks>