diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
index 58cf35c11..4fbb9df41 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
@@ -829,7 +829,7 @@ QVariantList VulkanPipelineStateViewer::makeSampler(const QString &bindset, cons
 
   filter = ToQStr(descriptor.filter);
 
-  if(descriptor.maxAnisotropy > 1.0f)
+  if(descriptor.maxAnisotropy >= 1.0f)
     filter += lit(" Aniso %1x").arg(descriptor.maxAnisotropy);
 
   if(descriptor.filter.filter == FilterFunction::Comparison)
diff --git a/renderdoc/driver/vulkan/vk_info.cpp b/renderdoc/driver/vulkan/vk_info.cpp
index 496847f87..e71181135 100644
--- a/renderdoc/driver/vulkan/vk_info.cpp
+++ b/renderdoc/driver/vulkan/vk_info.cpp
@@ -952,7 +952,7 @@ void VulkanCreationInfo::Sampler::Init(VulkanResourceManager *resourceMan, Vulka
   address[1] = pCreateInfo->addressModeV;
   address[2] = pCreateInfo->addressModeW;
   mipLodBias = pCreateInfo->mipLodBias;
-  maxAnisotropy = pCreateInfo->anisotropyEnable ? pCreateInfo->maxAnisotropy : 1.0f;
+  maxAnisotropy = pCreateInfo->anisotropyEnable ? pCreateInfo->maxAnisotropy : 0.0f;
   compareEnable = pCreateInfo->compareEnable != 0;
   compareOp = pCreateInfo->compareOp;
   minLod = pCreateInfo->minLod;
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index f71d1b724..116cdcd8c 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -1742,7 +1742,7 @@ void VulkanReplay::SavePipelineState(uint32_t eventId)
 
                 // sampler info
                 el.filter = MakeFilter(sampl.minFilter, sampl.magFilter, sampl.mipmapMode,
-                                       sampl.maxAnisotropy > 1.0f, sampl.compareEnable,
+                                       sampl.maxAnisotropy >= 1.0f, sampl.compareEnable,
                                        sampl.reductionMode);
                 el.addressU = MakeAddressMode(sampl.address[0]);
                 el.addressV = MakeAddressMode(sampl.address[1]);
diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
index 4fab7c23b..02c4726db 100644
--- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp
+++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
@@ -724,6 +724,7 @@ public:
           sampInfo.addressModeV = samplerProps.address[1];
           sampInfo.addressModeW = samplerProps.address[2];
           sampInfo.mipLodBias = samplerProps.mipLodBias;
+          sampInfo.anisotropyEnable = samplerProps.maxAnisotropy >= 1.0f;
           sampInfo.maxAnisotropy = samplerProps.maxAnisotropy;
           sampInfo.compareEnable = samplerProps.compareEnable;
           sampInfo.compareOp = samplerProps.compareOp;