diff --git a/frontend/web/components/EditIdentity.tsx b/frontend/web/components/EditIdentity.tsx
index 6190fbe831b1..d959e751a00e 100644
--- a/frontend/web/components/EditIdentity.tsx
+++ b/frontend/web/components/EditIdentity.tsx
@@ -70,7 +70,7 @@ const EditIdentity: FC<EditIdentityType> = ({ data, environmentId }) => {
         Edit
         <Icon name='edit' width={16} />
       </Button>
-      <ErrorMessage>{error}</ErrorMessage>
+      <ErrorMessage error={error} />
     </>
   )
 }
diff --git a/frontend/web/components/import-export/FeatureImport.tsx b/frontend/web/components/import-export/FeatureImport.tsx
index 43422ab41d37..856da014304c 100644
--- a/frontend/web/components/import-export/FeatureImport.tsx
+++ b/frontend/web/components/import-export/FeatureImport.tsx
@@ -438,7 +438,7 @@ const FeatureExport: FC<FeatureExportType> = ({ projectId }) => {
             prevPage={() => setPage(page - 1)}
             goToPage={setPage}
           />
-          <ErrorMessage>{error}</ErrorMessage>
+          <ErrorMessage error={error} />
           <div className='mt-4 text-right'>
             <Button disabled={isLoading} onClick={onSubmit}>
               Import Features
diff --git a/frontend/web/components/modals/ForgotPasswordModal.tsx b/frontend/web/components/modals/ForgotPasswordModal.tsx
index 9678304381ec..fa72bc61f96b 100644
--- a/frontend/web/components/modals/ForgotPasswordModal.tsx
+++ b/frontend/web/components/modals/ForgotPasswordModal.tsx
@@ -50,7 +50,7 @@ const ForgotPasswordModal: FC<ForgotPasswordModalType> = ({
           onChange={(e: InputEvent) => setEmail(Utils.safeParseEventValue(e))}
         />
 
-        <ErrorMessage>{error}</ErrorMessage>
+        <ErrorMessage error={error} />
       </div>
       <ModalHR />
       <div className='modal-footer'>
diff --git a/frontend/web/components/mv/VariationOptions.tsx b/frontend/web/components/mv/VariationOptions.tsx
index 8948ec8d68bd..041dba33d2fa 100644
--- a/frontend/web/components/mv/VariationOptions.tsx
+++ b/frontend/web/components/mv/VariationOptions.tsx
@@ -80,7 +80,7 @@ export const VariationOptions: FC<VariationOptionsProps> = ({
     <>
       {invalid && (
         <ErrorMessage
-          className='mt-2'
+          errorMessageClass='mt-2'
           error='Your variation percentage splits total to over 100%'
         />
       )}
diff --git a/frontend/web/components/pages/AccountSettingsPage.tsx b/frontend/web/components/pages/AccountSettingsPage.tsx
index a9c42f071cfc..f57888389e87 100644
--- a/frontend/web/components/pages/AccountSettingsPage.tsx
+++ b/frontend/web/components/pages/AccountSettingsPage.tsx
@@ -263,7 +263,7 @@ const AccountSettingsPage: FC = () => {
                 isValid={lastName && lastName.length}
                 type='text'
               />
-              {error && <ErrorMessage>{error}</ErrorMessage>}
+              {error && <ErrorMessage error={error} />}
               <div className='text-right'>
                 <Button
                   type='submit'
@@ -395,9 +395,7 @@ const AccountSettingsPage: FC = () => {
                     isValid={newPassword2 && newPassword2.length}
                     type='password'
                   />
-                  {passwordError && (
-                    <ErrorMessage>{passwordError}</ErrorMessage>
-                  )}
+                  {passwordError && <ErrorMessage error={passwordError} />}
                   <div className='text-right mt-5'>
                     <Button
                       type='submit'
diff --git a/frontend/web/components/pages/AuditLogItemPage.tsx b/frontend/web/components/pages/AuditLogItemPage.tsx
index 68f0daa49a21..d9235cb687d7 100644
--- a/frontend/web/components/pages/AuditLogItemPage.tsx
+++ b/frontend/web/components/pages/AuditLogItemPage.tsx
@@ -79,7 +79,7 @@ const AuditLogItemPage: FC = () => {
         </div>
       ) : (
         <div>
-          <ErrorMessage>{error}</ErrorMessage>
+          <ErrorMessage error={error} />
           {!!data && (
             <>
               <Panel title={'Details'} className='no-pad mb-2'>
diff --git a/frontend/web/components/pages/FeatureHistoryDetailPage.tsx b/frontend/web/components/pages/FeatureHistoryDetailPage.tsx
index be2c374c26e0..8b13c810226f 100644
--- a/frontend/web/components/pages/FeatureHistoryDetailPage.tsx
+++ b/frontend/web/components/pages/FeatureHistoryDetailPage.tsx
@@ -90,7 +90,7 @@ const FeatureHistoryPage: FC = () => {
         </div>
       </PageTitle>
       {!!(error || versionsError) && (
-        <ErrorMessage>{error || versionsError}</ErrorMessage>
+        <ErrorMessage error={error || versionsError} />
       )}
 
       {(isLoading || versionsLoading) && (
diff --git a/frontend/web/components/pages/admin-dashboard/AdminDashboardPage.tsx b/frontend/web/components/pages/admin-dashboard/AdminDashboardPage.tsx
index e58767571fdd..9bca5857482d 100644
--- a/frontend/web/components/pages/admin-dashboard/AdminDashboardPage.tsx
+++ b/frontend/web/components/pages/admin-dashboard/AdminDashboardPage.tsx
@@ -104,7 +104,7 @@ const AdminDashboardPage: FC = () => {
         </div>
       )}
 
-      <ErrorMessage>{error}</ErrorMessage>
+      <ErrorMessage error={error} />
 
       {data && (
         <>