diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43b66109..75deb555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Change Log
+## 1.25.7 - 2022-02-04
+### Changed
+* Fixed dev container load errors when dependency list include VSCode Remote Containers extension.
+
 ## 1.25.6 - 2022-01-28
 ### Changed
 * Fixed issue with Dev Container generation for External module sources
diff --git a/package-lock.json b/package-lock.json
index 7b586d07..43eb70b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "azure-iot-edge",
-  "version": "1.25.6",
+  "version": "1.25.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "azure-iot-edge",
-      "version": "1.25.6",
+      "version": "1.25.7",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@azure/arm-containerregistry": "^8.1.1",
diff --git a/package.json b/package.json
index bbe663b8..e8b21be8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "This extension is now a part of Azure IoT Tools extension pack. We highly recommend installing Azure IoT Tools to get full capabilities for Azure IoT development. Develop, deploy, debug, and manage your IoT Edge solution.",
-  "version": "1.25.6",
+  "version": "1.25.7",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",
@@ -588,7 +588,6 @@
   },
   "extensionDependencies": [
     "ms-vscode.azure-account",
-    "ms-vscode-remote.remote-containers",
     "vsciot-vscode.azure-iot-toolkit"
   ]
 }
diff --git a/src/edge/edgeManager.ts b/src/edge/edgeManager.ts
index 2bc26c70..d115c4ff 100644
--- a/src/edge/edgeManager.ts
+++ b/src/edge/edgeManager.ts
@@ -310,6 +310,12 @@ export class EdgeManager {
             return;
         }
 
+        const remoteExtenstion = vscode.extensions.getExtension("ms-vscode-remote.remote-containers");
+        if (remoteExtenstion === undefined) {
+            vscode.window.showInformationMessage("This feature requires the 'Remote - Container' extension be installed and active. Please see http://aka.ms/remcon for more details.");
+            return;
+        }
+
         const workspaceFolders = vscode.workspace.workspaceFolders;
         const defaultFolder: vscode.Uri | undefined = workspaceFolders && workspaceFolders.length > 0 ? workspaceFolders[0].uri : undefined;
         const workspaceFolder = defaultFolder.fsPath;
@@ -348,6 +354,7 @@ export class EdgeManager {
                     description: "",
                 },
             ];
+
             const doYouWishToReload = await vscode.window.showQuickPick(reloadDontReload, { placeHolder: Constants.reloadInDevContainer, ignoreFocusOut: true });
             if (doYouWishToReload && doYouWishToReload.label === Constants.CHOICE_YES) {
                 await vscode.commands.executeCommand("remote-containers.reopenInContainer", vscode.Uri.file(workspaceFolder), false);
@@ -1003,8 +1010,7 @@ export class EdgeManager {
                 vscode.window.showInformationMessage("New module for '" + template + "'");
         }
 
-        if (containerSource.length > 0)
-        {
+        if (containerSource.length > 0) {
             await fse.copy(containerSource, slnPath, { overwrite : true });
             await fse.copy(sourceLibrayScriptsPath, path.join(slnPath, Constants.dotDevContainer, Constants.libraryScriptsFolder));
         }