diff --git a/src/citra_qt/debugger/graphics/graphics_vertex_shader.h b/src/citra_qt/debugger/graphics/graphics_vertex_shader.h
index 166b6ba23..c31c82bf3 100644
--- a/src/citra_qt/debugger/graphics/graphics_vertex_shader.h
+++ b/src/citra_qt/debugger/graphics/graphics_vertex_shader.h
@@ -6,7 +6,17 @@
 
 #include <QAbstractTableModel>
 #include <QTreeView>
+
+// TODO(SachinV): Remove once we figure out why the /W0 is not enforced
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4715) // not all control paths return a value
+#endif
 #include <nihstro/parser_shbin.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
 #include "video_core/shader/debug_data.h"
 #include "video_core/shader/shader.h"
diff --git a/src/tests/video_core/shader/shader_jit_x64_compiler.cpp b/src/tests/video_core/shader/shader_jit_x64_compiler.cpp
index 79daca422..93ce88e0e 100644
--- a/src/tests/video_core/shader/shader_jit_x64_compiler.cpp
+++ b/src/tests/video_core/shader/shader_jit_x64_compiler.cpp
@@ -10,7 +10,17 @@
 #include <memory>
 #include <catch2/catch_approx.hpp>
 #include <catch2/catch_test_macros.hpp>
+
+// TODO(SachinV): Remove once we figure out why the /W0 is not enforced
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4715) // not all control paths return a value
+#endif
 #include <nihstro/inline_assembly.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "video_core/shader/shader_interpreter.h"
 #include "video_core/shader/shader_jit_x64_compiler.h"
 
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 24ec152f2..789dc99f2 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -14,7 +14,17 @@
 
 #include <nihstro/bit_field.h>
 #include <nihstro/float24.h>
+
+// TODO(SachinV): Remove once we figure out why the /W0 is not enforced
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4715) // not all control paths return a value
+#endif
 #include <nihstro/shader_binary.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/color.h"
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 19634babe..cff93f4a0 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -9,7 +9,17 @@
 #include <tuple>
 #include <utility>
 #include <fmt/format.h>
+
+// TODO(SachinV): Remove once we figure out why the /W0 is not enforced
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4715) // not all control paths return a value
+#endif
 #include <nihstro/shader_bytecode.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "video_core/renderer_opengl/gl_shader_decompiler.h"
diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h
index dc98b7cab..efc819727 100644
--- a/src/video_core/shader/shader.h
+++ b/src/video_core/shader/shader.h
@@ -12,7 +12,17 @@
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/base_object.hpp>
+
+// TODO(SachinV): Remove once we figure out why the /W0 is not enforced
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4715) // not all control paths return a value
+#endif
 #include <nihstro/shader_bytecode.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp
index e09285016..7ae88e86e 100644
--- a/src/video_core/shader/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -7,7 +7,17 @@
 #include <cmath>
 #include <numeric>
 #include <boost/container/static_vector.hpp>
+
+// TODO(SachinV): Remove once we figure out why the /W0 is not enforced
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4715) // not all control paths return a value
+#endif
 #include <nihstro/shader_bytecode.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
diff --git a/src/video_core/shader/shader_jit_x64_compiler.cpp b/src/video_core/shader/shader_jit_x64_compiler.cpp
index 126596357..008d98b5c 100644
--- a/src/video_core/shader/shader_jit_x64_compiler.cpp
+++ b/src/video_core/shader/shader_jit_x64_compiler.cpp
@@ -8,9 +8,19 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
-#include <nihstro/shader_bytecode.h>
 #include <smmintrin.h>
 #include <xmmintrin.h>
+
+// TODO(SachinV): Remove once we figure out why the /W0 is not enforced
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4715) // not all control paths return a value
+#endif
+#include <nihstro/shader_bytecode.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
diff --git a/src/video_core/shader/shader_jit_x64_compiler.h b/src/video_core/shader/shader_jit_x64_compiler.h
index 96dbfe82a..aacb4b5d4 100644
--- a/src/video_core/shader/shader_jit_x64_compiler.h
+++ b/src/video_core/shader/shader_jit_x64_compiler.h
@@ -13,8 +13,18 @@
 #include <optional>
 #include <utility>
 #include <vector>
-#include <nihstro/shader_bytecode.h>
 #include <xbyak/xbyak.h>
+
+// TODO(SachinV): Remove once we figure out why the /W0 is not enforced
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4715) // not all control paths return a value
+#endif
+#include <nihstro/shader_bytecode.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "common/bit_set.h"
 #include "common/common_types.h"
 #include "video_core/shader/shader.h"