diff --git a/athena-neptune/src/main/java/com/amazonaws/athena/connectors/neptune/NeptuneRecordHandler.java b/athena-neptune/src/main/java/com/amazonaws/athena/connectors/neptune/NeptuneRecordHandler.java
index c68ea68e04..03c132f72e 100644
--- a/athena-neptune/src/main/java/com/amazonaws/athena/connectors/neptune/NeptuneRecordHandler.java
+++ b/athena-neptune/src/main/java/com/amazonaws/athena/connectors/neptune/NeptuneRecordHandler.java
@@ -74,12 +74,12 @@ private static NeptuneConnection createConnection(java.util.Map<String, String>
         switch(graphType){
             case PROPERTYGRAPH: 
                 return new NeptuneGremlinConnection(configOptions.get(Constants.CFG_ENDPOINT),
-                configOptions.get(Constants.CFG_PORT), Boolean.parseBoolean(configOptions.getOrDefault(Constants.CFG_IAM, "false")),
+                configOptions.getOrDefault(Constants.CFG_PORT, "8182"), Boolean.parseBoolean(configOptions.getOrDefault(Constants.CFG_IAM, "false")),
                 configOptions.get(Constants.CFG_REGION));
 
             case RDF:
                 return new NeptuneSparqlConnection(configOptions.get(Constants.CFG_ENDPOINT),
-                        configOptions.get(Constants.CFG_PORT), Boolean.parseBoolean(configOptions.getOrDefault(Constants.CFG_IAM, "false")),
+                        configOptions.getOrDefault(Constants.CFG_PORT, "8182"), Boolean.parseBoolean(configOptions.getOrDefault(Constants.CFG_IAM, "false")),
                         configOptions.get(Constants.CFG_REGION));
         }
         return null;