diff --git a/packages/redux-devtools-rtk-query-monitor/src/containers/mapProps.tsx b/packages/redux-devtools-rtk-query-monitor/src/containers/mapProps.tsx
index 2dc00182..79271e9f 100644
--- a/packages/redux-devtools-rtk-query-monitor/src/containers/mapProps.tsx
+++ b/packages/redux-devtools-rtk-query-monitor/src/containers/mapProps.tsx
@@ -16,7 +16,8 @@ export function mapProps<In, Out>(
       render(): ReactNode {
         const mappedProps = mapper(this.props);
 
-        return <Comp {...mappedProps} />;
+        // TODO Not really sure why this is needed, but it is
+        return <Comp {...(mappedProps as Out & JSX.IntrinsicElements)} />;
       }
 
       static displayName = `mapProps(${
diff --git a/packages/redux-devtools-rtk-query-monitor/src/utils/comparators.ts b/packages/redux-devtools-rtk-query-monitor/src/utils/comparators.ts
index ff923a21..8714a864 100644
--- a/packages/redux-devtools-rtk-query-monitor/src/utils/comparators.ts
+++ b/packages/redux-devtools-rtk-query-monitor/src/utils/comparators.ts
@@ -55,6 +55,9 @@ export function compareJSONPrimitive<
     return 0;
   }
 
+  if (a == null) return -1;
+  if (b == null) return 1;
+
   return a > b ? 1 : -1;
 }