diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx
index 173f40772..40f9975fe 100644
--- a/ts/components/session/LeftPaneMessageSection.tsx
+++ b/ts/components/session/LeftPaneMessageSection.tsx
@@ -368,6 +368,9 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
       this.setState({ loading: true });
       try {
         const resolvedSessionID = await SNodeAPI.getSessionIDForOnsName(pubkeyorOns);
+        if (PubKey.validateWithError(resolvedSessionID)) {
+          throw new Error('Got a resolved ONS but the returned entry is not a vlaid SessionID');
+        }
         // this is a pubkey
         await ConversationController.getInstance().getOrCreateAndWait(
           resolvedSessionID,