diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
index dd90304b77..8ac858d4c1 100644
--- a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
@@ -77,7 +77,9 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
                 for (String name : cache.keySet()) {
                     if (name.startsWith(prefix)) {
                         String value = cache.get(name);
-                        cursor.addRow(new String[]{name, value});
+                        if (value != null) {
+                            cursor.addRow(new String[]{name, value});
+                        }
                     }
                 }
             }