diff --git a/frontend/src/api/proxyHosts.ts b/frontend/src/api/proxyHosts.ts
index 353cb01e..a70a41dd 100644
--- a/frontend/src/api/proxyHosts.ts
+++ b/frontend/src/api/proxyHosts.ts
@@ -8,6 +8,15 @@ export interface Location {
   forward_port: number;
 }
 
+export interface Certificate {
+  id: number;
+  uuid: string;
+  name: string;
+  provider: string;
+  domains: string;
+  expires_at: string;
+}
+
 export interface ProxyHost {
   uuid: string;
   domain_names: string;
@@ -24,6 +33,7 @@ export interface ProxyHost {
   advanced_config?: string;
   enabled: boolean;
   certificate_id?: number | null;
+  certificate?: Certificate | null;
   created_at: string;
   updated_at: string;
 }
diff --git a/frontend/src/components/ProxyHostForm.tsx b/frontend/src/components/ProxyHostForm.tsx
index 5ce39c74..d7f82847 100644
--- a/frontend/src/components/ProxyHostForm.tsx
+++ b/frontend/src/components/ProxyHostForm.tsx
@@ -372,9 +372,9 @@ export default function ProxyHostForm({ host, onSubmit, onCancel }: ProxyHostFor
               className="w-full bg-gray-900 border border-gray-700 rounded-lg px-4 py-2 text-white focus:outline-none focus:ring-2 focus:ring-blue-500"
             >
               <option value={0}>Request a new SSL Certificate</option>
-              {certificates.filter(c => c.provider === 'custom').map(cert => (
+              {certificates.map(cert => (
                 <option key={cert.id} value={cert.id}>
-                  {cert.name} ({cert.domain})
+                  {cert.name} ({cert.provider})
                 </option>
               ))}
             </select>
diff --git a/frontend/src/pages/ProxyHosts.tsx b/frontend/src/pages/ProxyHosts.tsx
index bef20316..e6d93640 100644
--- a/frontend/src/pages/ProxyHosts.tsx
+++ b/frontend/src/pages/ProxyHosts.tsx
@@ -136,16 +136,23 @@ export default function ProxyHosts() {
                       </div>
                     </td>
                     <td className="px-6 py-4 whitespace-nowrap">
-                      <div className="flex gap-2">
-                        {host.ssl_forced && (
-                          <span className="px-2 py-1 text-xs bg-green-900/30 text-green-400 rounded">
-                            SSL
-                          </span>
-                        )}
-                        {host.websocket_support && (
-                          <span className="px-2 py-1 text-xs bg-blue-900/30 text-blue-400 rounded">
-                            WS
-                          </span>
+                      <div className="flex flex-col gap-2">
+                        <div className="flex gap-2">
+                          {host.ssl_forced && (
+                            <span className="px-2 py-1 text-xs bg-green-900/30 text-green-400 rounded">
+                              SSL
+                            </span>
+                          )}
+                          {host.websocket_support && (
+                            <span className="px-2 py-1 text-xs bg-blue-900/30 text-blue-400 rounded">
+                              WS
+                            </span>
+                          )}
+                        </div>
+                        {host.certificate && (
+                          <div className="text-xs text-gray-400">
+                            {host.certificate.name} ({host.certificate.provider})
+                          </div>
                         )}
                       </div>
                     </td>