diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 4ceaa46720..13cd776bc9 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -185,6 +185,7 @@
   "log_entry_description": "",
   "log_entry_maximum_entries": "",
   "log_entry_maximum_entries_message": "",
+  "log_entry_maximum_entries_message_no_errors": "",
   "log_entry_maximum_entries_title": "",
   "log_hint_extra_info": "",
   "log_viewer_error": "",
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-entries.js b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-entries.js
index dc06ee0c26..1675243397 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-entries.js
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-entries.js
@@ -7,7 +7,7 @@ import { useIdeContext } from '../../../shared/context/ide-context'
 
 const LOG_PREVIEW_LIMIT = 100
 
-function PdfLogsEntries({ entries }) {
+function PdfLogsEntries({ entries, hasErrors }) {
   const { t } = useTranslation()
 
   const ide = useIdeContext()
@@ -34,6 +34,7 @@ function PdfLogsEntries({ entries }) {
         <PreviewLogsPaneMaxEntries
           totalEntries={entries.length}
           entriesShown={LOG_PREVIEW_LIMIT}
+          hasErrors={hasErrors}
         />
       )}
       {logEntries.map(logEntry => (
@@ -61,6 +62,7 @@ function PdfLogsEntries({ entries }) {
 }
 PdfLogsEntries.propTypes = {
   entries: PropTypes.arrayOf(PropTypes.object),
+  hasErrors: PropTypes.bool,
 }
 
 export default memo(PdfLogsEntries)
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.js b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.js
index 27a1083bb5..fa5ec127e2 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.js
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.js
@@ -42,7 +42,12 @@ function PdfLogsViewer() {
             <PdfValidationIssue key={name} name={name} issue={issue} />
           ))}
 
-        {logEntries?.all && <PdfLogsEntries entries={logEntries.all} />}
+        {logEntries?.all && (
+          <PdfLogsEntries
+            entries={logEntries.all}
+            hasErrors={logEntries.errors.length > 0}
+          />
+        )}
 
         {rawLog && (
           <PdfLogEntry
diff --git a/services/web/frontend/js/features/pdf-preview/util/output-files.js b/services/web/frontend/js/features/pdf-preview/util/output-files.js
index fa667598d2..bd6df61a51 100644
--- a/services/web/frontend/js/features/pdf-preview/util/output-files.js
+++ b/services/web/frontend/js/features/pdf-preview/util/output-files.js
@@ -53,7 +53,6 @@ export const handleOutputFiles = async (projectId, data) => {
   }
 
   result.logEntries = {
-    all: [],
     errors: [],
     warnings: [],
     typesetting: [],
@@ -72,7 +71,6 @@ export const handleOutputFiles = async (projectId, data) => {
           entry.key = `${entry.file}:${entry.line}:${entry.column}:${entry.message}`
         }
         result.logEntries[key].push(...newEntries[key])
-        result.logEntries.all.push(...newEntries[key])
       }
     }
   }
@@ -114,6 +112,12 @@ export const handleOutputFiles = async (projectId, data) => {
 
   result.fileList = buildFileList(outputFiles, data.clsiServerId)
 
+  result.logEntries.all = [
+    ...result.logEntries.errors,
+    ...result.logEntries.warnings,
+    ...result.logEntries.typesetting,
+  ]
+
   return result
 }
 
diff --git a/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.js b/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.js
index 6e588cd7ff..1bc9384ab5 100644
--- a/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.js
+++ b/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.js
@@ -3,7 +3,7 @@ import { Trans, useTranslation } from 'react-i18next'
 import PreviewLogEntryHeader from './preview-log-entry-header'
 import Icon from '../../../shared/components/icon'
 
-function PreviewLogsPaneMaxEntries({ totalEntries, entriesShown }) {
+function PreviewLogsPaneMaxEntries({ totalEntries, entriesShown, hasErrors }) {
   const { t } = useTranslation()
 
   const title = t('log_entry_maximum_entries_title', {
@@ -16,10 +16,17 @@ function PreviewLogsPaneMaxEntries({ totalEntries, entriesShown }) {
       <PreviewLogEntryHeader level="raw" headerTitle={title} />
       <div className="log-entry-content">
         <Icon type="lightbulb-o" />{' '}
-        <Trans
-          i18nKey="log_entry_maximum_entries_message"
-          components={[<b key="bold-1" />]}
-        />
+        {hasErrors ? (
+          <Trans
+            i18nKey="log_entry_maximum_entries_message"
+            components={[<b key="bold-1" />, <p />]} // eslint-disable-line react/jsx-key
+          />
+        ) : (
+          <Trans
+            i18nKey="log_entry_maximum_entries_message_no_errors"
+            components={[<b key="bold-1" />]}
+          />
+        )}
       </div>
     </div>
   )
@@ -28,6 +35,7 @@ function PreviewLogsPaneMaxEntries({ totalEntries, entriesShown }) {
 PreviewLogsPaneMaxEntries.propTypes = {
   totalEntries: PropTypes.number,
   entriesShown: PropTypes.number,
+  hasErrors: PropTypes.bool,
 }
 
 export default PreviewLogsPaneMaxEntries
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index f31464407e..2793323847 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -28,8 +28,9 @@
   "view_error_plural": "View all errors",
   "log_entry_description": "Log entry with level: __level__",
   "log_entry_maximum_entries": "Maximum log entries limit hit",
-  "log_entry_maximum_entries_title": "__total__ issues total. Showing the first __displayed__",
-  "log_entry_maximum_entries_message": "<0>Tip</0>: Try to fix the first error and recompile. Often one error causes many later error messages",
+  "log_entry_maximum_entries_title": "__total__ log messages total. Showing the first __displayed__",
+  "log_entry_maximum_entries_message": "<0>Tip</0>: Try to fix the first error and recompile. Often one error causes many later error messages.<1>If you need to see the full logs, you can still download them or view the raw logs below.</1>",
+  "log_entry_maximum_entries_message_no_errors": "<0>Tip</0>: If you need to see the full logs, you can still download them or view the raw logs below.",
   "navigate_log_source": "Navigate to log position in source code: __location__",
   "other_output_files": "Download other output files",
   "refresh": "Refresh",