diff --git a/src/containers/Tenant/Diagnostics/TopicData/TopicData.tsx b/src/containers/Tenant/Diagnostics/TopicData/TopicData.tsx
index 5bca9439e1..69a62475a0 100644
--- a/src/containers/Tenant/Diagnostics/TopicData/TopicData.tsx
+++ b/src/containers/Tenant/Diagnostics/TopicData/TopicData.tsx
@@ -7,6 +7,7 @@ import {isNil} from 'lodash';
 import {DrawerWrapper} from '../../../../components/Drawer';
 import {EmptyFilter} from '../../../../components/EmptyFilter/EmptyFilter';
 import EnableFullscreenButton from '../../../../components/EnableFullscreenButton/EnableFullscreenButton';
+import {PageError} from '../../../../components/Errors/PageError/PageError';
 import Fullscreen from '../../../../components/Fullscreen/Fullscreen';
 import {
     DEFAULT_TABLE_ROW_HEIGHT,
@@ -293,6 +294,10 @@ export function TopicData({scrollContainerRef, path, database}: TopicDataProps)
         );
     }, [database, path]);
 
+    if (error) {
+        return <PageError error={error} position="left" />;
+    }
+
     return (
         !isNil(baseOffset) &&
         !isNil(baseEndOffset) && (
diff --git a/src/containers/Tenant/Diagnostics/TopicData/TopicDataControls/TopicDataControls.tsx b/src/containers/Tenant/Diagnostics/TopicData/TopicDataControls/TopicDataControls.tsx
index 6b6903c3d3..fe94152148 100644
--- a/src/containers/Tenant/Diagnostics/TopicData/TopicDataControls/TopicDataControls.tsx
+++ b/src/containers/Tenant/Diagnostics/TopicData/TopicDataControls/TopicDataControls.tsx
@@ -97,7 +97,7 @@ export function TopicDataControls({
             />
             <TopicDataStartControls scrollToOffset={scrollToOffset} />
 
-            {!isNil(startOffset) && !isNil(endOffset) && (
+            {!isNil(startOffset) && !isNil(endOffset) && endOffset > startOffset && (
                 <Flex gap={1}>
                     <Text color="secondary" whiteSpace="nowrap">
                         {formatNumber(startOffset)}—{formatNumber(endOffset - 1)}
diff --git a/src/containers/Tenant/Diagnostics/TopicData/TopicMessageDetails/components/TopicMessage.tsx b/src/containers/Tenant/Diagnostics/TopicData/TopicMessageDetails/components/TopicMessage.tsx
index 87b9b40f80..06ebd57e9e 100644
--- a/src/containers/Tenant/Diagnostics/TopicData/TopicMessageDetails/components/TopicMessage.tsx
+++ b/src/containers/Tenant/Diagnostics/TopicData/TopicMessageDetails/components/TopicMessage.tsx
@@ -41,6 +41,7 @@ export function TopicMessage({offset, size, message}: TopicMessageProps) {
                 preparedMessage = decodedMessage;
             }
         } catch (e) {
+            preparedMessage = decodedMessage;
             console.warn(e);
         }