diff --git a/Source/Core/VideoBackends/Null/VertexManager.cpp b/Source/Core/VideoBackends/Null/VertexManager.cpp
index 17cab39b05..0e121ffa0d 100644
--- a/Source/Core/VideoBackends/Null/VertexManager.cpp
+++ b/Source/Core/VideoBackends/Null/VertexManager.cpp
@@ -13,13 +13,13 @@ namespace Null
 class NullNativeVertexFormat : public NativeVertexFormat
 {
 public:
-  NullNativeVertexFormat() {}
+  NullNativeVertexFormat(const PortableVertexDeclaration& vtx_decl_) { vtx_decl = vtx_decl_; }
 };
 
 std::unique_ptr<NativeVertexFormat>
 VertexManager::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl)
 {
-  return std::make_unique<NullNativeVertexFormat>();
+  return std::make_unique<NullNativeVertexFormat>(vtx_decl);
 }
 
 VertexManager::VertexManager() : m_local_v_buffer(MAXVBUFFERSIZE), m_local_i_buffer(MAXIBUFFERSIZE)
diff --git a/Source/Core/VideoCommon/ShaderCache.cpp b/Source/Core/VideoCommon/ShaderCache.cpp
index f369118962..299b0d1bca 100644
--- a/Source/Core/VideoCommon/ShaderCache.cpp
+++ b/Source/Core/VideoCommon/ShaderCache.cpp
@@ -35,7 +35,7 @@ bool ShaderCache::Initialize()
   m_async_shader_compiler->ResizeWorkerThreads(g_ActiveConfig.GetShaderPrecompilerThreads());
 
   // Load shader and UID caches.
-  if (g_ActiveConfig.bShaderCache)
+  if (g_ActiveConfig.bShaderCache && m_api_type != APIType::Nothing)
   {
     LoadShaderCaches();
     LoadPipelineUIDCache();