diff --git a/node/src/main/java/de/obsidiancloud/node/command/CommandCommand.java b/node/src/main/java/de/obsidiancloud/node/command/CommandCommand.java
index 324558c..3d557c5 100644
--- a/node/src/main/java/de/obsidiancloud/node/command/CommandCommand.java
+++ b/node/src/main/java/de/obsidiancloud/node/command/CommandCommand.java
@@ -6,7 +6,6 @@
 import de.obsidiancloud.common.command.CommandExecutor;
 import de.obsidiancloud.node.ObsidianCloudNode;
 import de.obsidiancloud.node.local.LocalOCServer;
-import java.io.BufferedWriter;
 import java.io.IOException;
 import java.util.Arrays;
 import org.jetbrains.annotations.NotNull;
@@ -37,9 +36,8 @@ public void execute(@NotNull CommandExecutor executor, @NotNull String @NotNull
         Process process = localServer.getProcess();
         try {
             if (process != null && process.isAlive()) {
-                try (BufferedWriter writer = process.outputWriter()) {
-                    writer.write(command + "\n");
-                }
+                process.outputWriter().write(command + "\n");
+                process.outputWriter().flush();
             } else {
                 ObsidianCloudNode.getLogger().warning("Cannot send command, the server is not running.");
             }
diff --git a/node/src/main/java/de/obsidiancloud/node/local/LocalOCServer.java b/node/src/main/java/de/obsidiancloud/node/local/LocalOCServer.java
index 930b7e4..f98564a 100644
--- a/node/src/main/java/de/obsidiancloud/node/local/LocalOCServer.java
+++ b/node/src/main/java/de/obsidiancloud/node/local/LocalOCServer.java
@@ -12,7 +12,6 @@
 import de.obsidiancloud.node.util.Flags;
 import de.obsidiancloud.node.util.NetworkUtil;
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
@@ -103,10 +102,8 @@ public void stop() {
                 if (platform == null) {
                     process.destroy();
                 } else {
-                    try (BufferedWriter writer = process.outputWriter()) {
-                        writer.write(getData().platform().stopCommand() + "\n");
-                        writer.flush();
-                    }
+                    process.outputWriter().write(getData().platform().stopCommand() + "\n");
+                    process.outputWriter().flush();
                 }
             }
         } catch (Throwable exception) {
@@ -365,6 +362,7 @@ public void setConnection(@NotNull Connection connection) {
     private void stopped() {
         ObsidianCloudNode.getLogger().info("Server " + getName() + " stopped");
         NetworkUtil.unblockPort(port);
+        port = -1;
         ServerPortChangedPacket packet = new ServerPortChangedPacket();
         packet.setName(getName());
         packet.setPort(-1);