diff --git a/lib/SPIRV/SPIRVReader.cpp b/lib/SPIRV/SPIRVReader.cpp
index f2fdc8baa48..10b2fd7f035 100644
--- a/lib/SPIRV/SPIRVReader.cpp
+++ b/lib/SPIRV/SPIRVReader.cpp
@@ -1437,6 +1437,8 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
     else if (LinkageTy == GlobalValue::CommonLinkage)
         // In LLVM variables with common linkage type must be initilized by 0
         Initializer = Constant::getNullValue(Ty);
+    else if (BVar->getStorageClass() == SPIRVStorageClassKind::StorageClassWorkgroup)
+        Initializer = dyn_cast<Constant>(UndefValue::get(Ty));
 
     SPIRVStorageClassKind BS = BVar->getStorageClass();
     if (BS == StorageClassFunction && !Init) {
diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp
index dff6cfefd3d..2df2eb25fc4 100644
--- a/lib/SPIRV/SPIRVWriter.cpp
+++ b/lib/SPIRV/SPIRVWriter.cpp
@@ -892,7 +892,7 @@ LLVMToSPIRV::transValueWithoutDecoration(Value *V, SPIRVBasicBlock *BB,
     auto BVar = static_cast<SPIRVVariable *>(BM->addVariable(
       transType(Ty), GV->isConstant(),
       transLinkageType(GV),
-      Init ? transValue(Init, nullptr) : nullptr,
+      (Init && !isa<UndefValue>(Init)) ? transValue(Init, nullptr) : nullptr,
       GV->getName(),
       SPIRSPIRVAddrSpaceMap::map(
         static_cast<SPIRAddressSpace>(Ty->getAddressSpace())),
diff --git a/test/SPIRV/transcoding/OpVariable_Initializer.ll b/test/SPIRV/transcoding/OpVariable_Initializer.ll
new file mode 100755
index 00000000000..89d14945d93
--- /dev/null
+++ b/test/SPIRV/transcoding/OpVariable_Initializer.ll
@@ -0,0 +1,44 @@
+; RUN: llvm-as %s -o %t.bc
+; RUN: llvm-spirv %t.bc -spirv-text -o %t.spt
+; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
+; RUN: llvm-spirv %t.bc -o %t.spv
+; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
+; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
+
+; CHECK-LLVM: @test_atomic_fn.L = internal addrspace(3) global [64 x i32] undef, align 4
+
+; CHECK-SPIRV-NOT: undef
+; CHECK-SPIRV-SAME: 4 Variable 5 6 4
+
+target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
+target triple = "spir-unknown-unknown"
+
+@test_atomic_fn.L = internal addrspace(3) global [64 x i32] undef, align 4
+
+; Function Attrs: nounwind
+define spir_kernel void @test_atomic_fn() #0 {
+  ret void
+}
+
+attributes #0 = { nounwind }
+
+!opencl.kernels = !{!0}
+!opencl.enable.FP_CONTRACT = !{}
+!spirv.Source = !{!6}
+!opencl.spir.version = !{!7}
+!opencl.ocl.version = !{!8}
+!opencl.used.extensions = !{!9}
+!opencl.used.optional.core.features = !{!9}
+!spirv.Generator = !{!10}
+
+!0 = !{void ()* @test_atomic_fn, !1, !2, !3, !4, !5}
+!1 = !{!"kernel_arg_addr_space"}
+!2 = !{!"kernel_arg_access_qual"}
+!3 = !{!"kernel_arg_type"}
+!4 = !{!"kernel_arg_type_qual"}
+!5 = !{!"kernel_arg_base_type"}
+!6 = !{i32 3, i32 100000}
+!7 = !{i32 1, i32 2}
+!8 = !{i32 1, i32 0}
+!9 = !{}
+!10 = !{i16 7, i16 0}