diff --git a/lib/services/log-source-map-service.ts b/lib/services/log-source-map-service.ts
index a8ec3c8af0..6fe68e6aa0 100644
--- a/lib/services/log-source-map-service.ts
+++ b/lib/services/log-source-map-service.ts
@@ -67,8 +67,17 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 	public async setSourceMapConsumerForFile(filePath: string): Promise<void> {
 		try {
 			if (!this.$fs.getFsStats(filePath).isDirectory()) {
+				const mapFile = filePath + ".map";
+				let sourceMapRaw;
 				const source = this.$fs.readText(filePath);
-				const sourceMapRaw = sourceMapConverter.fromSource(source);
+				if (this.$fs.exists(mapFile)) {
+					sourceMapRaw = sourceMapConverter.fromMapFileSource(
+						source,
+						path.dirname(filePath)
+					);
+				} else {
+					sourceMapRaw = sourceMapConverter.fromSource(source);
+				}
 				let smc: any = null;
 				if (sourceMapRaw && sourceMapRaw.sourcemap) {
 					const sourceMap = sourceMapRaw.sourcemap;
diff --git a/test/files/sourceMapBundle/.gitignore b/test/files/sourceMapBundle/.gitignore
new file mode 100644
index 0000000000..3c15e25e6b
--- /dev/null
+++ b/test/files/sourceMapBundle/.gitignore
@@ -0,0 +1 @@
+!**/*.map
diff --git a/test/files/sourceMapBundle/android/app/external.js b/test/files/sourceMapBundle/android/app/external.js
new file mode 100644
index 0000000000..6ca84a64ab
--- /dev/null
+++ b/test/files/sourceMapBundle/android/app/external.js
@@ -0,0 +1,19 @@
+module.exports =
+  (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["external"],{
+
+    /***/ "./external-test.js":
+    /***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+      "use strict";
+      __webpack_require__.r(__webpack_exports__);
+      /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onTap", function() { return onTap; });
+      function onTap() {
+        console.log("Test.");
+        console.trace("Test");
+        throw new Error("Test");
+      }
+
+      /***/ })
+
+  },[["./external-test.js","runtime"]]]);
+//# sourceMappingURL=external.js.map
diff --git a/test/files/sourceMapBundle/android/app/external.js.map b/test/files/sourceMapBundle/android/app/external.js.map
new file mode 100644
index 0000000000..2f3f621834
--- /dev/null
+++ b/test/files/sourceMapBundle/android/app/external.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./external-test.js"],"names":["onTap","console","log","trace","Error"],"mappings":";;;;;;;AAAA;AAAA;AAAO,SAASA,KAAT,GAAiB;AACpBC,SAAO,CAACC,GAAR,CAAY,OAAZ;AACAD,SAAO,CAACE,KAAR,CAAc,MAAd;AACA,QAAM,IAAIC,KAAJ,CAAU,MAAV,CAAN;AACH,C","file":"external.js","sourcesContent":["export function onTap() {\n    console.log(\"Test.\");\n    console.trace(\"Test\");\n    throw new Error(\"Test\");\n}"],"sourceRoot":""}
diff --git a/test/files/sourceMapBundle/ios/app/external.js b/test/files/sourceMapBundle/ios/app/external.js
new file mode 100644
index 0000000000..6ca84a64ab
--- /dev/null
+++ b/test/files/sourceMapBundle/ios/app/external.js
@@ -0,0 +1,19 @@
+module.exports =
+  (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["external"],{
+
+    /***/ "./external-test.js":
+    /***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+      "use strict";
+      __webpack_require__.r(__webpack_exports__);
+      /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onTap", function() { return onTap; });
+      function onTap() {
+        console.log("Test.");
+        console.trace("Test");
+        throw new Error("Test");
+      }
+
+      /***/ })
+
+  },[["./external-test.js","runtime"]]]);
+//# sourceMappingURL=external.js.map
diff --git a/test/files/sourceMapBundle/ios/app/external.js.map b/test/files/sourceMapBundle/ios/app/external.js.map
new file mode 100644
index 0000000000..2f3f621834
--- /dev/null
+++ b/test/files/sourceMapBundle/ios/app/external.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./external-test.js"],"names":["onTap","console","log","trace","Error"],"mappings":";;;;;;;AAAA;AAAA;AAAO,SAASA,KAAT,GAAiB;AACpBC,SAAO,CAACC,GAAR,CAAY,OAAZ;AACAD,SAAO,CAACE,KAAR,CAAc,MAAd;AACA,QAAM,IAAIC,KAAJ,CAAU,MAAV,CAAN;AACH,C","file":"external.js","sourcesContent":["export function onTap() {\n    console.log(\"Test.\");\n    console.trace(\"Test\");\n    throw new Error(\"Test\");\n}"],"sourceRoot":""}
diff --git a/test/services/log-source-map-service.ts b/test/services/log-source-map-service.ts
index e888a93484..6e15615248 100644
--- a/test/services/log-source-map-service.ts
+++ b/test/services/log-source-map-service.ts
@@ -95,6 +95,23 @@ const testCases: IDictionary<Array<{
 			expected:
 				"System.err: 	at com.tns.Runtime.dispatchCallJSMethodNative(Runtime.java:1203)\n",
 		},
+		// External maps
+		{
+			caseName: "trace message (external map)",
+			message:
+				"JS: at onTap (file:///data/data/org.nativescript.sourceMap/files/app/external.js:12:22)",
+			expected: `JS: at onTap file: ${toPlatformSep(
+				"src/external-test.js"
+			)}:3:4\n`,
+		},
+		{
+			caseName: "error message (external map)",
+			message:
+				"System.err: 	Frame: function:'./external-test.js.onTap', file:'file:///data/data/org.nativescript.sourceMap/files/app/external.js', line: 13, column: 32",
+			expected: `System.err: 	Frame: function:'./external-test.js.onTap', file:'file: ${toPlatformSep(
+				"src/external-test.js"
+			)}:4:4\n`,
+		},
 	],
 	ios: [
 		{
@@ -119,7 +136,7 @@ const testCases: IDictionary<Array<{
 			)}:31:31 JS ERROR Error: Test\n`,
 		},
 		{
-			caseName: "error stack tracew",
+			caseName: "error stack trace",
 			message: "onTap@file:///app/bundle.js:296:32",
 			expected: `onTap@file: ${toPlatformSep(
 				"src/main-view-model.ts"
@@ -138,6 +155,33 @@ const testCases: IDictionary<Array<{
 				"src/main-view-model.ts"
 			)}:31:18)\n`,
 		},
+		// External maps
+		{
+			caseName: "console message (external map)",
+			message: "CONSOLE LOG file:///app/external.js:11:20: Test.",
+			expected: `CONSOLE LOG file: ${toPlatformSep(
+				"src/external-test.js"
+			)}:2:16 Test.\n`,
+		},
+		{
+			caseName: "trace message (external map)",
+			message: "CONSOLE TRACE file:///app/external.js:12:22: Test",
+			expected: `CONSOLE TRACE file: ${toPlatformSep(
+				"src/external-test.js"
+			)}:3:4 Test\n`,
+		},
+		{
+			caseName: "error message (external map)",
+			message: "file:///app/external.js:13:32: JS ERROR Error: Test",
+			expected: `file: ${toPlatformSep(
+				"src/external-test.js"
+			)}:4:4 JS ERROR Error: Test\n`,
+		},
+		{
+			caseName: "error stack trace (external map)",
+			message: "onTap@file:///app/external.js:13:32",
+			expected: `onTap@file: ${toPlatformSep("src/external-test.js")}:4:4\n`,
+		},
 	],
 };
 
@@ -158,6 +202,10 @@ describe("log-source-map-service", () => {
 			const fs = testInjector.resolve<IFileSystem>("fs");
 			const files = fs.enumerateFilesInDirectorySync(originalFilesLocation);
 			for (const file of files) {
+				if (file.endsWith(".map")) {
+					continue;
+				}
+
 				await logSourceMapService.setSourceMapConsumerForFile(file);
 			}
 		});