diff --git a/ts/background.ts b/ts/background.ts
index b2d978f47..2435c52de 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -38,7 +38,6 @@ import { isWindowDragElement } from './util/isWindowDragElement';
 import { assertDev, strictAssert } from './util/assert';
 import { filter } from './util/iterables';
 import { isNotNil } from './util/isNotNil';
-import { isPnpEnabled } from './util/isPnpEnabled';
 import { setAppLoadingScreenMessage } from './setAppLoadingScreenMessage';
 import { IdleDetector } from './IdleDetector';
 import { expiringMessagesDeletionService } from './services/expiringMessagesDeletion';
@@ -1787,7 +1786,7 @@ export async function startApp(): Promise<void> {
           // Note: we always have to register our capabilities all at once, so we do this
           //   after connect on every startup
           await server.registerCapabilities({
-            pni: isPnpEnabled(),
+            pni: true,
           });
         } catch (error) {
           log.error(
diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
index 52d62ee25..0db50ff3f 100644
--- a/ts/textsecure/WebAPI.ts
+++ b/ts/textsecure/WebAPI.ts
@@ -29,7 +29,6 @@ import {
 import { formatAcceptLanguageHeader } from '../util/userLanguages';
 import { toWebSafeBase64, fromWebSafeBase64 } from '../util/webSafeBase64';
 import { getBasicAuth } from '../util/getBasicAuth';
-import { isPnpEnabled } from '../util/isPnpEnabled';
 import { createHTTPSAgent } from '../util/createHTTPSAgent';
 import { createProxyAgent } from '../util/createProxyAgent';
 import type { SocketStatus } from '../types/SocketStatus';
@@ -2254,7 +2253,7 @@ export function initialize({
           registrationId,
           pniRegistrationId,
           capabilities: {
-            pni: isPnpEnabled(),
+            pni: true,
           },
           unidentifiedAccessKey: Bytes.toBase64(accessKey),
         },
@@ -2307,7 +2306,7 @@ export function initialize({
           registrationId,
           pniRegistrationId,
           capabilities: {
-            pni: isPnpEnabled(),
+            pni: true,
           },
         },
         aciSignedPreKey: serializeSignedPreKey(aciSignedPreKey),