diff --git a/ogn/gateway/client.py b/ogn/gateway/client.py
index 2309120..045f80d 100644
--- a/ogn/gateway/client.py
+++ b/ogn/gateway/client.py
@@ -19,7 +19,14 @@ class ognGateway:
         # create socket, connect to server, login and make a file object associated with the socket
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-        self.sock.connect((settings.APRS_SERVER_HOST, settings.APRS_SERVER_PORT))
+
+        if self.aprs_filter:
+            port = settings.APRS_SERVER_PORT_CLIENT_DEFINED_FILTERS
+        else:
+            port = settings.APRS_SERVER_PORT_FULL_FEED
+
+        self.sock.connect((settings.APRS_SERVER_HOST, port))
+        self.logger.debug('Server port {}'.format(port))
 
         login = create_aprs_login(self.aprs_user, -1, settings.APRS_APP_NAME, settings.APRS_APP_VER, self.aprs_filter)
         self.sock.send(login.encode())
diff --git a/ogn/gateway/manage.py b/ogn/gateway/manage.py
index 6c409fc..d7ce903 100644
--- a/ogn/gateway/manage.py
+++ b/ogn/gateway/manage.py
@@ -28,7 +28,6 @@ def run(aprs_user='anon-dev', logfile='main.log', loglevel='INFO'):
         log_handlers.append(logging.FileHandler(logfile))
     logging.basicConfig(format=logging_formatstr, level=loglevel, handlers=log_handlers)
 
-
     print('Start ogn gateway')
     gateway = ognGateway(aprs_user)
     gateway.connect()
diff --git a/ogn/gateway/settings.py b/ogn/gateway/settings.py
index 0273c48..ccd9f4f 100644
--- a/ogn/gateway/settings.py
+++ b/ogn/gateway/settings.py
@@ -1,7 +1,8 @@
 APRS_SERVER_HOST = 'aprs.glidernet.org'
-APRS_SERVER_PORT = 10152
+APRS_SERVER_PORT_FULL_FEED = 10152
+APRS_SERVER_PORT_CLIENT_DEFINED_FILTERS = 14580
+
 APRS_APP_NAME = 'ogn-gateway-python'
 APRS_APP_VER = '0.2'
 
-APRS_FILTER = ''
 APRS_KEEPALIVE_TIME = 240