diff --git a/src/view/app/Query/query.tsx b/src/view/app/Query/query.tsx
index c9d555f6..56bd2595 100644
--- a/src/view/app/Query/query.tsx
+++ b/src/view/app/Query/query.tsx
@@ -228,6 +228,10 @@ function QueryForm({ tableData, tableName, isReadOnly }: IConfigProps) {
         }
         processBooleanFields(message.data.columns, message.data.rawData);
 
+        if (message.data.rawData === undefined) {
+            logger.log('message.data.rawData in query.tsx handleData() is undefined');
+            return;
+        }
         setRawRows([...rawRows, ...message.data.rawData]);
         setRowID(
             message.data.rawData.length > 0