diff --git a/src-ts/tools/learn/course-certificate/certificate-view/CertificateView.tsx b/src-ts/tools/learn/course-certificate/certificate-view/CertificateView.tsx
index 465c19982..ead6c3bab 100644
--- a/src-ts/tools/learn/course-certificate/certificate-view/CertificateView.tsx
+++ b/src-ts/tools/learn/course-certificate/certificate-view/CertificateView.tsx
@@ -66,7 +66,11 @@ const CertificateView: FC<CertificateViewProps> = (props: CertificateViewProps)
     const {
         certification: certificate,
         ready: certificateReady,
-    }: AllCertificationsProviderData = useAllCertifications(props.provider, course?.certificationId)
+    }: AllCertificationsProviderData = useAllCertifications(
+        props.provider,
+        course?.certificationId,
+        {enabled: !!course?.certificationId}
+    )
 
     const ready: boolean = useMemo(() => (
         completedCertificateReady && courseReady && certificateReady
@@ -142,7 +146,7 @@ const CertificateView: FC<CertificateViewProps> = (props: CertificateViewProps)
         <>
             <LoadingSpinner hide={ready} />
 
-            {readyAndCompletedCertification && (
+            {ready && readyAndCompletedCertification && (
                 <div className={styles['wrap']}>
                     <div className={styles['content-wrap']}>
                         {!props.hideActions && (
diff --git a/src-ts/tools/learn/course-certificate/certificate-view/certificate/certificate-bg-pattern/CertificateBgPattern.tsx b/src-ts/tools/learn/course-certificate/certificate-view/certificate/certificate-bg-pattern/CertificateBgPattern.tsx
index f1d2196b7..82fdb7c1a 100644
--- a/src-ts/tools/learn/course-certificate/certificate-view/certificate/certificate-bg-pattern/CertificateBgPattern.tsx
+++ b/src-ts/tools/learn/course-certificate/certificate-view/certificate/certificate-bg-pattern/CertificateBgPattern.tsx
@@ -1,10 +1,12 @@
 import classNames from 'classnames'
 import { FC } from 'react'
 
+import { LearnCertificateTrackType } from '../../../../learn-lib'
+
 import styles from './CertificateBgPattern.module.scss'
 
 interface CertificateBgPatternProps {
-    type: 'QA'|'DEV'|'DATASCIENCE'|'DESIGN'
+    type: LearnCertificateTrackType
 }
 
 const CertificateBgPattern: FC<CertificateBgPatternProps> = (props: CertificateBgPatternProps) => {