diff --git a/vscode/src/telemetry/telemetry.ts b/vscode/src/telemetry/telemetry.ts
index fc55d4c..4040aba 100644
--- a/vscode/src/telemetry/telemetry.ts
+++ b/vscode/src/telemetry/telemetry.ts
@@ -26,7 +26,7 @@ export namespace Telemetry {
 
 	export const getIsTelemetryFeatureAvailable = (): boolean => {
 		const TELEMETRY_API = TelemetryConfiguration.getInstance()?.getApiConfig();
-		return TELEMETRY_API?.baseUrl != null && TELEMETRY_API?.baseUrl.trim().length > 0;
+		return TELEMETRY_API?.baseUrl != null && TELEMETRY_API?.baseUrl.trim().length > 0 && (TELEMETRY_API?.baseUrl.trim().startsWith("https://") || process.env['oracle_oracleJava_allow_httpTelemetryServer'] === "true");
 	}
 
 	export const initializeTelemetry = (contextInfo: ExtensionContextInfo): TelemetryManager => {
diff --git a/vscode/src/webviews/jdkDownloader/view.ts b/vscode/src/webviews/jdkDownloader/view.ts
index 9733119..fd11557 100644
--- a/vscode/src/webviews/jdkDownloader/view.ts
+++ b/vscode/src/webviews/jdkDownloader/view.ts
@@ -196,7 +196,7 @@ export class JdkDownloaderView {
             if (isString(availableVersions)) {
                 const availableVersionsObj = JSON.parse(availableVersions);
                 if (availableVersionsObj?.items) {
-                    const jdkVersions = availableVersionsObj?.items?.map((version: any) => version.jdkDetails.jdkVersion);
+                    const jdkVersions = availableVersionsObj?.items?.map((version: any) => String(version.jdkDetails.jdkVersion).replace(/[^a-zA-Z0-9_.+-]/g,""));
                     LOGGER.log(`Fetched Oracle JDK versions: ${jdkVersions}`);
 
                     return jdkVersions;