diff --git a/ui-common/src/components/TrafficViewer/EntryDetailed/EntrySections.tsx b/ui-common/src/components/TrafficViewer/EntryDetailed/EntrySections.tsx
index 02321c5e1..d43bda4d1 100644
--- a/ui-common/src/components/TrafficViewer/EntryDetailed/EntrySections.tsx
+++ b/ui-common/src/components/TrafficViewer/EntryDetailed/EntrySections.tsx
@@ -158,9 +158,10 @@ export const EntryBodySection: React.FC<EntryBodySectionProps> = ({
                 return jsonBeautify(protobufDecoded, null, 2, 80);
             }
         } catch (error) {
-            if(isDecodeGrpc)
+            if (String(error).includes("More than one message in")){
+                if(isDecodeGrpc)
                 setIsDecodeGrpc(false);
-            if (!String(error).includes("More than one message in")){
+            } else {
                 console.error(error);
             }
         }