diff --git a/services/core/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java
index 59daee9ea2ff5..b9a0738d15c49 100644
--- a/services/core/java/com/android/server/display/PersistentDataStore.java
+++ b/services/core/java/com/android/server/display/PersistentDataStore.java
@@ -153,7 +153,7 @@ final class PersistentDataStore {
 
     @VisibleForTesting
     PersistentDataStore(Injector injector) {
-        this(injector, BackgroundThread.getHandler());
+        this(injector, new Handler(BackgroundThread.getHandler().getLooper()));
     }
 
     @VisibleForTesting