diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpServerSession.java b/src/main/java/com/github/steveice10/packetlib/tcp/TcpServerSession.java
index 6ebb21db..4d0f205a 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpServerSession.java
+++ b/src/main/java/com/github/steveice10/packetlib/tcp/TcpServerSession.java
@@ -32,19 +32,9 @@ public class TcpServerSession extends TcpSession {
         return this.server.hasGlobalFlag(key);
     }
 
-    @Override
-    public <T> T getFlag(String key) {
-        T ret = super.getFlag(key);
-        if(ret != null) {
-            return ret;
-        }
-
-        return this.server.getGlobalFlag(key);
-    }
-
     @Override
     public <T> T getFlag(String key, T def) {
-        T ret = super.getFlag(key);
+        T ret = super.getFlag(key, null);
         if(ret != null) {
             return ret;
         }