diff --git a/public/app/features/explore/Logs/utils/logs.test.ts b/public/app/features/explore/Logs/utils/logs.test.ts
new file mode 100644
index 00000000000..42883ff1ad4
--- /dev/null
+++ b/public/app/features/explore/Logs/utils/logs.test.ts
@@ -0,0 +1,27 @@
+import { DataQuery } from '@grafana/data';
+
+import { canKeepDisplayedFields } from './logs';
+
+describe('canKeepDisplayedFields', () => {
+  test('Returns false when passing no queries', () => {
+    expect(canKeepDisplayedFields(undefined, [])).toBe(false);
+  });
+
+  test('Returns false when some prev queries are undefined', () => {
+    const logQueries: DataQuery[] = [{ refId: 'A' }, { refId: 'B' }];
+    const prevLogQueries = [{ refId: 'C' }];
+    expect(canKeepDisplayedFields(logQueries, prevLogQueries)).toBe(false);
+  });
+
+  test('Returns false when some new queries are undefined', () => {
+    const logQueries: DataQuery[] = [{ refId: 'A' }];
+    const prevLogQueries = [{ refId: 'C' }, { refId: 'B' }];
+    expect(canKeepDisplayedFields(logQueries, prevLogQueries)).toBe(false);
+  });
+
+  test('Returns true when the queries exactly match', () => {
+    const logQueries: DataQuery[] = [{ refId: 'C' }, { refId: 'B' }];
+    const prevLogQueries = [{ refId: 'C' }, { refId: 'B' }];
+    expect(canKeepDisplayedFields(logQueries, prevLogQueries)).toBe(true);
+  });
+});
diff --git a/public/app/features/explore/Logs/utils/logs.ts b/public/app/features/explore/Logs/utils/logs.ts
index 61e4f9ce5d5..edcaf0fc2c4 100644
--- a/public/app/features/explore/Logs/utils/logs.ts
+++ b/public/app/features/explore/Logs/utils/logs.ts
@@ -17,7 +17,7 @@ export const canKeepDisplayedFields = (logsQueries: DataQuery[] | undefined, pre
     return false;
   }
   for (let i = 0; i < logsQueries.length; i++) {
-    if (!shallowCompare(logsQueries[i], prevLogsQueries[i])) {
+    if (!logsQueries[i] || !prevLogsQueries[i] || !shallowCompare(logsQueries[i], prevLogsQueries[i])) {
       return false;
     }
   }