diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
index 345f8a3c15d62..3714c15af173a 100644
--- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
@@ -635,12 +635,13 @@ public class ClipboardOverlayController {
     }
 
     private Intent getRemoteCopyIntent(ClipData clipData) {
-        String remoteCopyPackage = mContext.getString(R.string.config_remoteCopyPackage);
-        if (TextUtils.isEmpty(remoteCopyPackage)) {
-            return null;
-        }
         Intent nearbyIntent = new Intent(REMOTE_COPY_ACTION);
-        nearbyIntent.setComponent(ComponentName.unflattenFromString(remoteCopyPackage));
+
+        String remoteCopyPackage = mContext.getString(R.string.config_remoteCopyPackage);
+        if (!TextUtils.isEmpty(remoteCopyPackage)) {
+            nearbyIntent.setComponent(ComponentName.unflattenFromString(remoteCopyPackage));
+        }
+
         nearbyIntent.setClipData(clipData);
         nearbyIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);