diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
index ae11bee59..e2fda4c0f 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
@@ -531,6 +531,12 @@ VkResult WrappedVulkan::vkFlushMappedMemoryRanges(
 			MemMapState *state = GetRecord(pMemRanges[i].mem)->memMapState;
 			state->mapFlushed = true;
 
+			if(state->mappedPtr == NULL)
+			{
+				RDCERR("Flushing memory that isn't currently mapped");
+				continue;
+			}
+
 			if(capframe)
 			{
 				CACHE_THREAD_SERIALISER();