diff --git a/src/main/java/net/pixtaded/crab/client/CrabClient.java b/src/main/java/net/pixtaded/crab/client/CrabClient.java
index 6355e80..4336866 100644
--- a/src/main/java/net/pixtaded/crab/client/CrabClient.java
+++ b/src/main/java/net/pixtaded/crab/client/CrabClient.java
@@ -38,7 +38,6 @@ public class CrabClient implements Crab {
         try {
             if (this.serverAddress == null)
                 setup();
-            connect();
             communicate();
         } catch (IOException e) {
             System.err.println("Error connecting to the server: " + e.getMessage());
@@ -97,12 +96,14 @@ public class CrabClient implements Crab {
     }
 
     private void sendPacket(byte PID, String argument) throws IOException {
+        connect();
         String formattedMessage = String.valueOf((char) PID) + argument + "\n";
 
         out.print(formattedMessage);
         out.flush();
 
         receiveResponse(PID);
+        closeConnection();
     }
 
     private void receiveResponse(byte PID) throws IOException {
@@ -121,8 +122,6 @@ public class CrabClient implements Crab {
             } default -> {
             }
         }
-        closeConnection();
-        connect();
     }
 
     private void closeConnection() {