diff --git a/src/compiler/sourcemapDecoder.ts b/src/compiler/sourcemapDecoder.ts
index 4248ac21829a4..57f46bdcfe817 100644
--- a/src/compiler/sourcemapDecoder.ts
+++ b/src/compiler/sourcemapDecoder.ts
@@ -61,7 +61,7 @@ namespace ts.sourcemaps {
 
     export function decode(host: SourceMapDecodeHost, mapPath: string, map: SourceMapData, program?: Program, fallbackCache = createSourceFileLikeCache(host)): SourceMapper {
         const currentDirectory = getDirectoryPath(mapPath);
-        const sourceRoot = map.sourceRoot || currentDirectory;
+        const sourceRoot = map.sourceRoot ? getNormalizedAbsolutePath(map.sourceRoot, currentDirectory) : currentDirectory;
         let decodedMappings: ProcessedSourceMapPosition[];
         let generatedOrderedMappings: ProcessedSourceMapPosition[];
         let sourceOrderedMappings: ProcessedSourceMapPosition[];
diff --git a/tests/cases/fourslash/server/declarationMapsGoToDefinitionRelativeSourceRoot.ts b/tests/cases/fourslash/server/declarationMapsGoToDefinitionRelativeSourceRoot.ts
new file mode 100644
index 0000000000000..6f5a0c19bf382
--- /dev/null
+++ b/tests/cases/fourslash/server/declarationMapsGoToDefinitionRelativeSourceRoot.ts
@@ -0,0 +1,40 @@
+/// <reference path="../fourslash.ts" />
+// @Filename: index.ts
+////export class Foo {
+////    member: string;
+////    /*2*/methodName(propName: SomeType): void {}
+////    otherMethod() {
+////        if (Math.random() > 0.5) {
+////            return {x: 42};
+////        }
+////        return {y: "yes"};
+////    }
+////}
+////
+////export interface SomeType {
+////    member: number;
+////}
+// @Filename: out/indexdef.d.ts.map
+////{"version":3,"file":"indexdef.d.ts","sourceRoot":"../","sources":["index.ts"],"names":[],"mappings":"AAAA;IACI,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IACpC,WAAW;;;;;;;CAMd;AAED,MAAM,WAAW,QAAQ;IACrB,MAAM,EAAE,MAAM,CAAC;CAClB"}
+// @Filename: out/indexdef.d.ts
+////export declare class Foo {
+////    member: string;
+////    methodName(propName: SomeType): void;
+////    otherMethod(): {
+////        x: number;
+////        y?: undefined;
+////    } | {
+////        y: string;
+////        x?: undefined;
+////    };
+////}
+////export interface SomeType {
+////    member: number;
+////}
+//////# sourceMappingURL=out/indexdef.d.ts.map
+// @Filename: mymodule.ts
+////import * as mod from "./out/indexdef";
+////const instance = new mod.Foo();
+////instance.[|/*1*/methodName|]({member: 12});
+
+verify.goToDefinition("1", "2");