diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
index 83badd9230f..281fab27757 100755
--- a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
+++ b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
@@ -434,8 +434,6 @@ public <T> T baseNetworkOperation(final OStorageRemoteOperation<T> operation, fi
           throw OException.wrapException(new OStorageException(errorMessage), e);
         } else {
           session.removeServerSession(network.getServerURL());
-          if (--retry <= 0)
-            throw OException.wrapException(new OStorageException(errorMessage), e);
         }
         serverUrl = null;
       } catch (OOfflineNodeException e) {
@@ -1175,8 +1173,9 @@ public List<ORecordOperation> commit(final OTransactionInternal iTx) {
 
   public void rollback(OTransactionInternal iTx) {
     try {
-      if (((OTransactionOptimistic) iTx).isAlreadyCleared()) {
+      if (((OTransactionOptimistic) iTx).isAlreadyCleared() && getCurrentSession().getAllServerSessions().size() > 0) {
         ORollbackTransactionRequest request = new ORollbackTransactionRequest(iTx.getId());
+
         ORollbackTransactionResponse response = networkOperation(request, "Error on fetching next page for statment: " + request);
       }
     } finally {
diff --git a/server/src/test/java/com/orientechnologies/orient/server/query/RemoteTokenExpireTest.java b/server/src/test/java/com/orientechnologies/orient/server/query/RemoteTokenExpireTest.java
new file mode 100755
index 00000000000..3d2642eb711
--- /dev/null
+++ b/server/src/test/java/com/orientechnologies/orient/server/query/RemoteTokenExpireTest.java
@@ -0,0 +1,259 @@
+package com.orientechnologies.orient.server.query;
+
+import com.orientechnologies.common.io.OFileUtils;
+import com.orientechnologies.orient.core.Orient;
+import com.orientechnologies.orient.core.db.ODatabaseType;
+import com.orientechnologies.orient.core.db.OrientDB;
+import com.orientechnologies.orient.core.db.OrientDBConfig;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
+import com.orientechnologies.orient.core.id.ORecordId;
+import com.orientechnologies.orient.core.index.OIndex;
+import com.orientechnologies.orient.core.sql.executor.OResultSet;
+import com.orientechnologies.orient.enterprise.channel.binary.OTokenSecurityException;
+import com.orientechnologies.orient.server.OServer;
+import com.orientechnologies.orient.server.token.OTokenHandlerImpl;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+
+import static com.orientechnologies.orient.core.config.OGlobalConfiguration.QUERY_REMOTE_RESULTSET_PAGE_SIZE;
+
+/**
+ * Created by wolf4ood on 1/03/19.
+ */
+public class RemoteTokenExpireTest {
+
+  private static final String            SERVER_DIRECTORY = "./target/token";
+  private              OServer           server;
+  private              OrientDB          orientDB;
+  private              ODatabaseDocument session;
+  private              int               oldPageSize;
+
+  private long expireTimeout = 500;
+
+  @Before
+  public void before() throws Exception {
+
+    OFileUtils.deleteRecursively(new File(SERVER_DIRECTORY));
+    server = new OServer(false);
+    server.setServerRootDirectory(SERVER_DIRECTORY);
+    server.startup(getClass().getResourceAsStream("orientdb-server-config.xml"));
+
+    server.activate();
+
+    OTokenHandlerImpl token = (OTokenHandlerImpl) server.getTokenHandler();
+    token.setSessionInMills(expireTimeout);
+
+    orientDB = new OrientDB("remote:localhost", "root", "root", OrientDBConfig.defaultConfig());
+    orientDB.create(RemoteTokenExpireTest.class.getSimpleName(), ODatabaseType.MEMORY);
+    session = orientDB.open(RemoteTokenExpireTest.class.getSimpleName(), "admin", "admin");
+    session.createClass("Some");
+    oldPageSize = QUERY_REMOTE_RESULTSET_PAGE_SIZE.getValueAsInteger();
+    QUERY_REMOTE_RESULTSET_PAGE_SIZE.setValue(10);
+
+  }
+
+  private void clean() {
+    server.getClientConnectionManager().cleanExpiredConnections();
+  }
+
+  private void waitAndClean(long ms) {
+    try {
+      Thread.sleep(ms);
+      clean();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+  }
+
+  private void waitAndClean() {
+    waitAndClean(expireTimeout);
+  }
+
+  @Test
+  public void itShouldNotFailWithQuery() {
+
+    waitAndClean();
+
+    session.activateOnCurrentThread();
+
+    try (OResultSet res = session.query("select from Some")) {
+
+      Assert.assertEquals(0, res.stream().count());
+
+    } catch (OTokenSecurityException e) {
+
+      Assert.fail("It should not get the exception");
+    }
+
+  }
+
+  @Test
+  public void itShouldNotFailWithCommand() {
+
+    waitAndClean();
+
+    session.activateOnCurrentThread();
+
+    try (OResultSet res = session.command("insert into V set name = 'foo'")) {
+
+      Assert.assertEquals(1, res.stream().count());
+
+    } catch (OTokenSecurityException e) {
+
+      Assert.fail("It should not get the exception");
+    }
+
+  }
+
+  @Test
+  public void itShouldNotFailWithScript() {
+
+    waitAndClean();
+
+    session.activateOnCurrentThread();
+
+    try (OResultSet res = session.execute("sql", "insert into V set name = 'foo'")) {
+
+      Assert.assertEquals(1, res.stream().count());
+
+    } catch (OTokenSecurityException e) {
+
+      Assert.fail("It should not get the exception");
+    }
+  }
+
+  @Test
+  public void itShouldFailWithQueryNext() throws InterruptedException {
+
+    QUERY_REMOTE_RESULTSET_PAGE_SIZE.setValue(1);
+
+    try (OResultSet res = session.query("select from OUser")) {
+
+      waitAndClean();
+      session.activateOnCurrentThread();
+      Assert.assertEquals(3, res.stream().count());
+
+    } catch (OTokenSecurityException e) {
+      return;
+    } finally {
+      QUERY_REMOTE_RESULTSET_PAGE_SIZE.setValue(10);
+    }
+    Assert.fail("It should get an exception");
+
+  }
+
+  @Test
+  public void itShouldNotFailWithNewTXAndQuery() {
+
+    waitAndClean();
+
+    session.activateOnCurrentThread();
+
+    session.begin();
+
+    session.save(session.newElement("Some"));
+
+    try (OResultSet res = session.query("select from Some")) {
+      Assert.assertEquals(1, res.stream().count());
+    } catch (OTokenSecurityException e) {
+      Assert.fail("It should not get the expire exception");
+    } finally {
+      session.rollback();
+    }
+
+  }
+
+  @Test
+  public void itShouldNotFailAtCommit() {
+
+    session.begin();
+
+    session.save(session.newElement("Some"));
+
+    waitAndClean();
+
+    session.activateOnCurrentThread();
+
+    try {
+      session.commit();
+    } catch (OTokenSecurityException e) {
+      Assert.fail("It should not get the expire exception");
+    }
+
+  }
+
+  @Test
+  public void itShouldFailAtBeingAndQuery() {
+
+    session.begin();
+
+    session.save(session.newElement("Some"));
+
+    try (OResultSet resultSet = session.query("select from Some")) {
+      Assert.assertEquals(1, resultSet.stream().count());
+    }
+    waitAndClean();
+
+    session.activateOnCurrentThread();
+
+    try {
+      session.query("select from Some");
+    } catch (OTokenSecurityException e) {
+      session.rollback();
+      return;
+    }
+    Assert.fail("It should not get the expire exception");
+
+  }
+
+  @Test
+  public void itShouldNotFailWithIndexGet() {
+
+    OIndex<?> index = session.getMetadata().getIndexManager().getIndex("OUser.name");
+
+    waitAndClean();
+
+    session.activateOnCurrentThread();
+
+    try {
+      index.get("admin");
+    } catch (OTokenSecurityException e) {
+      Assert.fail("It should not get the expire exception");
+    }
+
+  }
+
+  @Test
+  public void itShouldNotFailWithIndexPut() {
+
+    OIndex<?> index = session.getMetadata().getIndexManager().getIndex("OUser.name");
+
+    waitAndClean();
+
+    session.activateOnCurrentThread();
+
+    try {
+      index.put("test", new ORecordId(5, 0));
+    } catch (OTokenSecurityException e) {
+      Assert.fail("It should  get the expire exception");
+    }
+
+  }
+
+  @After
+  public void after() {
+    QUERY_REMOTE_RESULTSET_PAGE_SIZE.setValue(oldPageSize);
+    session.close();
+    orientDB.close();
+    server.shutdown();
+
+    Orient.instance().shutdown();
+    OFileUtils.deleteRecursively(new File(SERVER_DIRECTORY));
+    Orient.instance().startup();
+  }
+
+}