diff --git a/.pre_commit/set-java-version.sh b/.pre_commit/set-java-version.sh
index b90805a05a..872b413d1e 100755
--- a/.pre_commit/set-java-version.sh
+++ b/.pre_commit/set-java-version.sh
@@ -20,6 +20,11 @@ set_java_version_ubuntu() {
 # Function to set Java version on macOS
 set_java_version_macos() {
   local version="$1"
+  
+  if [[ -n "$JAVA_HOME" && "$JAVA_HOME" =~ $version ]]; then
+    echo "JAVA_HOME is already set to a compatible version: $JAVA_HOME"
+    return 0
+  fi
 
   echo "Setting Java version to $version on macOS..."
 
diff --git a/integration/flink/app/src/main/java/io/openlineage/flink/tracker/OpenLineageContinousJobTracker.java b/integration/flink/app/src/main/java/io/openlineage/flink/tracker/OpenLineageContinousJobTracker.java
index 33f15e7585..9dad339ecf 100644
--- a/integration/flink/app/src/main/java/io/openlineage/flink/tracker/OpenLineageContinousJobTracker.java
+++ b/integration/flink/app/src/main/java/io/openlineage/flink/tracker/OpenLineageContinousJobTracker.java
@@ -52,7 +52,7 @@ public void startTracking(FlinkExecutionContext context) {
     String checkpointApiUrl =
         String.format(
             "http://%s:%s/jobs/%s/checkpoints",
-            config.get(RestOptions.ADDRESS),
+            Optional.ofNullable(config.get(RestOptions.ADDRESS)).orElse("localhost"),
             config.get(RestOptions.PORT),
             context.getJobId().toString());
     HttpGet request = new HttpGet(checkpointApiUrl);