diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/ServerTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/ServerTable.java
index 10ee47f33..b5950de15 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/ServerTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/ServerTable.java
@@ -160,35 +160,6 @@ public class ServerTable extends Table {
         });
     }
 
-    /**
-     * Returns server Name for a matching UUID
-     *
-     * @param serverUUID UUID of the server.
-     * @return Name or empty optional.
-     */
-    public Optional<String> getServerName(UUID serverUUID) {
-        String sql = Select.from(tableName,
-                NAME)
-                .where(SERVER_UUID + "=?")
-                .toString();
-
-        return query(new QueryStatement<Optional<String>>(sql) {
-            @Override
-            public void prepare(PreparedStatement statement) throws SQLException {
-                statement.setString(1, serverUUID.toString());
-            }
-
-            @Override
-            public Optional<String> processResults(ResultSet set) throws SQLException {
-                if (set.next()) {
-                    return Optional.of(set.getString(NAME));
-                } else {
-                    return Optional.empty();
-                }
-            }
-        });
-    }
-
     public Map<UUID, String> getServerNames() {
         String sql = Select.from(tableName,
                 SERVER_UUID, NAME)
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
index b81264ff9..8f24b8503 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
@@ -130,7 +130,7 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
 
     @Override
     public Optional<String> getServerName(UUID serverUUID) {
-        return serverTable.getServerName(serverUUID);
+        return db.query(OptionalFetchQueries.fetchMatchingServerIdentifier(serverUUID)).map(Server::getName);
     }
 
     @Override