diff --git a/src/utils/generate/registry.ts b/src/utils/generate/registry.ts
index 16fdda2e5..d32fe21d0 100644
--- a/src/utils/generate/registry.ts
+++ b/src/utils/generate/registry.ts
@@ -9,11 +9,20 @@ export function registryURLParser(input?: string) {
 export async function registryValidation(registryUrl?: string, registryAuth?: string, registryToken?: string) {
   if (!registryUrl) { return; }
   try {
-    const response = await fetch(registryUrl as string);
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 5000); // 5 second timeout
+    
+    const response = await fetch(registryUrl as string, {
+      method: 'HEAD', // Use lightweight HEAD instead of GET
+      signal: controller.signal
+    });
+    clearTimeout(timeoutId);
+    
     if (response.status === 401 && !registryAuth && !registryToken) {
       throw new Error('You Need to pass either registryAuth in username:password encoded in Base64 or need to pass registryToken');
     }
-  } catch {
-    throw new Error(`Can't fetch registryURL: ${registryUrl}`);
+  } catch (err: any) {
+    // Preserve original error message
+    throw new Error(`Can't fetch registryURL: ${registryUrl} - ${err.message}`);
   }
 }