diff --git a/frontend/src/components/LanguagePicker/index.tsx b/frontend/src/components/LanguagePicker/index.tsx
index 886c5d6f..af2b073e 100644
--- a/frontend/src/components/LanguagePicker/index.tsx
+++ b/frontend/src/components/LanguagePicker/index.tsx
@@ -25,10 +25,6 @@ function Language({ name, code }: LanguageProps) {
   );
 }
 
-function LanguageSkeleton() {
-  return <span className="ml-2 flex h-10 w-24 animate-pulse bg-gray-500/25" />;
-}
-
 interface LanguagePickerProps {
   languages: Array<{ name: string; code: string }>;
 }
@@ -46,14 +42,3 @@ export function LanguagePicker({ languages }: LanguagePickerProps) {
     </nav>
   );
 }
-
-export function LanguagePickerSkeleton() {
-  return (
-    <nav className="flex items-center">
-      <span className="mr-2 text-gray-700 dark:text-gray-300">
-        Provider language
-      </span>
-      <LanguageSkeleton />
-    </nav>
-  );
-}
diff --git a/frontend/src/routes/Provider/components/VersionInfo.tsx b/frontend/src/routes/Provider/components/VersionInfo.tsx
index 02f5bd74..bb7885e7 100644
--- a/frontend/src/routes/Provider/components/VersionInfo.tsx
+++ b/frontend/src/routes/Provider/components/VersionInfo.tsx
@@ -1,8 +1,5 @@
 import { OldVersionBanner } from "@/components/OldVersionBanner";
-import {
-  LanguagePicker,
-  LanguagePickerSkeleton,
-} from "@/components/LanguagePicker";
+import { LanguagePicker } from "@/components/LanguagePicker";
 import { VersionInfo, VersionInfoSkeleton } from "@/components/VersionInfo";
 import { useSuspenseQueries } from "@tanstack/react-query";
 import { getProviderDataQuery, getProviderVersionDataQuery } from "../query";
@@ -50,7 +47,7 @@ export function ProviderVersionInfo() {
     <div className="flex flex-col gap-5">
       <div className="flex items-center justify-between">
         <VersionInfo currentVersion={version} latestVersion={latestVersion} />
-        <LanguagePicker languages={languages} />
+        {languages.length > 0 && <LanguagePicker languages={languages} />}
       </div>
       {version !== latestVersion && (
         <OldVersionBanner latestVersionLink={latestVersionLink} />
@@ -60,10 +57,5 @@ export function ProviderVersionInfo() {
 }
 
 export function ProviderVersionInfoSkeleton() {
-  return (
-    <div className="flex items-center justify-between">
-      <VersionInfoSkeleton />
-      <LanguagePickerSkeleton />
-    </div>
-  );
+  return <VersionInfoSkeleton />;
 }