diff --git a/app/actions/remote/channel.ts b/app/actions/remote/channel.ts
index c8cfed5f5..ec136a2d1 100644
--- a/app/actions/remote/channel.ts
+++ b/app/actions/remote/channel.ts
@@ -1279,11 +1279,12 @@ export const convertGroupMessageToPrivateChannel = async (serverUrl: string, cha
     try {
         const client = NetworkManager.getClient(serverUrl);
         const name = generateChannelNameFromDisplayName(displayName);
-
         const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const existingChannel = await getChannelById(database, channelId);
 
-        // addConvertingChannel ??? do we need to do this?
+        const existingChannel = await getChannelById(database, channelId);
+        if (existingChannel) {
+            EphemeralStore.addConvertingChannel(channelId);
+        }
 
         const updatedChannel = await client.convertGroupMessageToPrivateChannel(channelId, teamId, displayName, name);
 
@@ -1302,5 +1303,7 @@ export const convertGroupMessageToPrivateChannel = async (serverUrl: string, cha
         logDebug('error on convertGroupMessageToPrivateChannel', getFullErrorMessage(error));
         forceLogoutIfNecessary(serverUrl, error);
         return {error};
+    } finally {
+        EphemeralStore.removeConvertingChannel(channelId);
     }
 };
diff --git a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx
index a35732707..85da96bdf 100644
--- a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx
+++ b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx
@@ -18,9 +18,6 @@ import MessageBox from '../message_box/message_box';
 import {TeamSelector} from '../team_selector';
 
 import {NoCommonTeamForm} from './no_common_teams_form';
-import { dismissAllModalsAndPopToRoot, popToRoot, popTopScreen } from '@app/screens/navigation';
-import { switchToChannel } from '@actions/local/channel';
-import { update } from 'lodash';
 
 const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
     return {
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0157d7ea5..c3f6f0a8b 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -570,9 +570,9 @@ PODS:
     - React-Core
   - RNVectorIcons (10.0.0):
     - React-Core
-  - SDWebImage (5.18.2):
-    - SDWebImage/Core (= 5.18.2)
-  - SDWebImage/Core (5.18.2)
+  - SDWebImage (5.18.3):
+    - SDWebImage/Core (= 5.18.3)
+  - SDWebImage/Core (5.18.3)
   - SDWebImageWebPCoder (0.13.0):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
@@ -986,7 +986,7 @@ SPEC CHECKSUMS:
   RNShare: da6d90b6dc332f51f86498041d6e34211f96b630
   RNSVG: 03e4d258ca355d7836a0a5dd4d4dc63c1eb49cbb
   RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9
-  SDWebImage: c0de394d7cf7f9838aed1fd6bb6037654a4572e4
+  SDWebImage: 96e0c18ef14010b7485210e92fac888587ebb958
   SDWebImageWebPCoder: af09429398d99d524cae2fe00f6f0f6e491ed102
   Sentry: 56c76eed917f7dffd46db50906afbf5c9aa2673a
   SentryPrivate: f3be34b5deb9fe676fdfb1f1ad5cdb1b740c5688
@@ -1001,4 +1001,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 25f07cb9e5eed8c84db8e8723000e8470c349058
 
-COCOAPODS: 1.14.2
\ No newline at end of file
+COCOAPODS: 1.14.2