diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 7651951f4..24de0c604 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -236,7 +236,7 @@ export async function processDecrypted(envelope: EnvelopePlus, decrypted: any) {
   /* tslint:disable:no-bitwise */
 }
 
-function isMessageEmpty(message: SignalService.DataMessage) {
+export function isMessageEmpty(message: SignalService.DataMessage) {
   const {
     flags,
     body,
@@ -267,7 +267,7 @@ function isBodyEmpty(body: string) {
   return _.isEmpty(body) || isBodyAutoFRContent(body);
 }
 
-export function isBodyAutoFRContent(body: string) {
+function isBodyAutoFRContent(body: string) {
   return (
     body === 'Please accept to enable messages to be synced across devices'
   );
diff --git a/ts/receiver/syncMessages.ts b/ts/receiver/syncMessages.ts
index c4cf355f1..94b56e432 100644
--- a/ts/receiver/syncMessages.ts
+++ b/ts/receiver/syncMessages.ts
@@ -9,13 +9,14 @@ import { handleEndSession } from './sessionHandling';
 import { handleMediumGroupUpdate } from './mediumGroups';
 import {
   handleMessageEvent,
-  isBodyAutoFRContent,
+  isMessageEmpty,
   processDecrypted,
 } from './dataMessage';
 import { updateProfile } from './receiver';
 import { handleContacts } from './multidevice';
 import { onGroupReceived } from './groups';
 import { MultiDeviceProtocol } from '../session/protocols';
+import { DataMessage } from '../session/messages/outgoing';
 
 export async function handleSyncMessage(
   envelope: EnvelopePlus,
@@ -92,8 +93,8 @@ async function handleSentMessage(
     return;
   }
 
-  if (msg.body && isBodyAutoFRContent(msg.body)) {
-    window.console.log('dropping autoFR message synced');
+  if (isMessageEmpty(msg as SignalService.DataMessage)) {
+    window.console.log('dropping empty message synced');
     await removeFromCache(envelope);
     return;
   }