diff --git a/distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java b/distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java
index b9474fd23cb..fe8ba7d4dad 100644
--- a/distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java
+++ b/distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java
@@ -519,7 +519,7 @@ public void hazelcastPluginShutdown() {
       }
     }
 
-    if (hazelcastInstance != null) {
+    if (hazelcastInstance != null)
       try {
         hazelcastInstance.shutdown();
       } catch (Exception e) {
@@ -527,7 +527,6 @@ public void hazelcastPluginShutdown() {
       } finally {
         hazelcastInstance = null;
       }
-    }
 
     OCallableUtils.executeIgnoringAnyExceptions(
         new OCallableNoParamNoReturn() {
diff --git a/server/src/main/java/com/orientechnologies/orient/server/OServer.java b/server/src/main/java/com/orientechnologies/orient/server/OServer.java
index 0119748b091..4fb18e47aea 100755
--- a/server/src/main/java/com/orientechnologies/orient/server/OServer.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/OServer.java
@@ -562,7 +562,6 @@ public boolean shutdown() {
 
   protected boolean deinit() {
     try {
-      if (!running) return false;
       running = false;
 
       OLogManager.instance().info(this, "OrientDB Server is shutting down...");