diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
index 11b2a0be..473bfe08 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
@@ -165,11 +165,8 @@ public class TrustInterfaceService extends LineageSystemService {
 
     private boolean hasUsbRestrictorInternal() {
         DevicePolicyManager policyManager = mContext.getSystemService(DevicePolicyManager.class);
-        if (policyManager != null) {
-            return policyManager.canUsbDataSignalingBeDisabled() || mUsbRestrictor != null;
-        } else {
-            return mUsbRestrictor != null;
-        }
+        return mUsbRestrictor != null ||
+                (policyManager != null && policyManager.canUsbDataSignalingBeDisabled());
     }
 
     private boolean postOnBoardingNotification() {