diff --git a/GIFCollector/Services/GIFFileManager.swift b/GIFCollector/Services/GIFFileManager.swift
index 56eac89..d8b8c04 100644
--- a/GIFCollector/Services/GIFFileManager.swift
+++ b/GIFCollector/Services/GIFFileManager.swift
@@ -1,7 +1,7 @@
 import Foundation
 import UIKit
 
-var appGroupID = "group."+Bundle.main.bundleIdentifier.unsafelyUnwrapped
+var appGroupID = "group."+Bundle.main.bundleIdentifier.unsafelyUnwrapped.replacing(".iMessage", with:"")
 
 class GIFFileManager {
     static let shared = GIFFileManager()
diff --git a/GIFCollectorShare/ShareViewController.swift b/GIFCollectorShare/ShareViewController.swift
index 2020e89..2fbf274 100644
--- a/GIFCollectorShare/ShareViewController.swift
+++ b/GIFCollectorShare/ShareViewController.swift
@@ -17,7 +17,7 @@ class ShareViewController: SLComposeServiceViewController {
   private var debugMessages: [String] = []
 
   // Use the same constants as in the main app
-  private let appGroupID = "group."+Bundle.main.bundleIdentifier.unsafelyUnwrapped
+  private let appGroupID = "group."+Bundle.main.bundleIdentifier.unsafelyUnwrapped.replacing(".Share", with:"")
   private let pendingGIFsKey = "pendingGIFs"
 
   override func viewDidLoad() {