diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 9b274496783..3cbd2715461 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -949,16 +949,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         System.exit(0);
     }
 
-    @Override
-    public void reconnect() {
-        session.disconnect(false);
-        tablesPane.clearChat();
-        disableButtons();
-        if (performConnect()) {
-            enableButtons();
-        }
-    }
-
     public void enableButtons() {
         btnConnect.setEnabled(true);
         btnConnect.setText("Disconnect");
@@ -1221,10 +1211,18 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    setStatusText("Not connected");
-                    disableButtons();
-                    hideGames();
-                    hideTables();
+                        disableButtons();
+                    if (JOptionPane.showConfirmDialog(null, "The connection to server was lost. Reconnect?", "Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+                        session.disconnect(false);
+                        tablesPane.clearChat();
+                        if (performConnect()) {
+                            enableButtons();
+                        }
+                    } else {
+                        setStatusText("Not connected");
+                        hideGames();
+                        hideTables();
+                    }
                 }
             });
         }
diff --git a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
index 7842c2b0b67..2a815d702f7 100644
--- a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
+++ b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
@@ -74,11 +74,6 @@ public class MultiConnectTest {
             logger.info("disconnected");
         }
 
-        @Override
-        public void reconnect() {
-            logger.info("Not implemented");
-        }
-
         @Override
         public void showMessage(String message) {
             logger.info("showMessage: " + message);
diff --git a/Mage.Common/src/mage/interfaces/MageClient.java b/Mage.Common/src/mage/interfaces/MageClient.java
index 8fb8ec989e9..5458616b9e3 100644
--- a/Mage.Common/src/mage/interfaces/MageClient.java
+++ b/Mage.Common/src/mage/interfaces/MageClient.java
@@ -40,7 +40,6 @@ public interface MageClient extends CallbackClient {
     MageVersion getVersion();
     void connected(String message);
     void disconnected();
-    void reconnect();
     void showMessage(String message);
     void showError(String message);
 
diff --git a/Mage.Common/src/mage/remote/SessionImpl.java b/Mage.Common/src/mage/remote/SessionImpl.java
index 00c7dec2f12..8b4b6c487a7 100644
--- a/Mage.Common/src/mage/remote/SessionImpl.java
+++ b/Mage.Common/src/mage/remote/SessionImpl.java
@@ -54,7 +54,6 @@ import org.jboss.remoting.transport.bisocket.Bisocket;
 import org.jboss.remoting.transport.socket.SocketWrapper;
 import org.jboss.remoting.transporter.TransporterClient;
 
-import javax.swing.*;
 import java.net.*;
 import java.util.*;
 import mage.constants.ManaType;
@@ -1318,9 +1317,6 @@ public class SessionImpl implements Session {
             if (isConnected()) {
                 if (!server.ping(sessionId)) {
                     logger.error(new StringBuilder("Ping failed: ").append(this.getUserName()).append(" Session: ").append(sessionId).append(" to MAGE server at ").append(connection.getHost()).append(":").append(connection.getPort()).toString());
-                    if (JOptionPane.showConfirmDialog(null, "The connection to server was lost. Reconnect?", "Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
-                        client.reconnect();
-                    }
                 }
             }
             return true;
diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java
index 4730737ee00..ec7eccf69f7 100644
--- a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java
+++ b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java
@@ -257,11 +257,6 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient {
         }
     }
 
-    @Override
-    public void reconnect() {
-        logger.info("Not implemented.");
-    }
-
     @Override
     public void showMessage(final String message) {
         if (SwingUtilities.isEventDispatchThread()) {
diff --git a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java
index e2a2b9a64d8..9849eaa987a 100644
--- a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java
+++ b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java
@@ -42,11 +42,6 @@ public class SimpleMageClient implements MageClient {
         // do nothing
     }
 
-    @Override
-    public void reconnect() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
     @Override
     public void showMessage(String message) {
         log.info(message);