diff --git a/sat/memory/sqla.py b/sat/memory/sqla.py
index a4e49990..34ee7482 100644
--- a/sat/memory/sqla.py
+++ b/sat/memory/sqla.py
@@ -1365,12 +1365,13 @@ class Storage:
             else:
                 last = result[-1][1].name
 
-
             metadata["rsm"] = {
-                "index": index,
-                "count": rows_count,
-                "first": first,
-                "last": last,
+                k: v for k, v in {
+                    "index": index,
+                    "count": rows_count,
+                    "first": first,
+                    "last": last,
+                }.items() if v is not None
             }
             metadata["complete"] = index + len(result) == rows_count