diff --git a/layers/gpu_validation.cpp b/layers/gpu_validation.cpp
index 498617f..095ae0c 100644
--- a/layers/gpu_validation.cpp
+++ b/layers/gpu_validation.cpp
@@ -328,6 +328,7 @@
     BUFFER_STATE *buffer_state = GetBufferState(pInfo->buffer);
     // Validate against the size requested when the buffer was created
     if (buffer_state) {
+        buffer_state->deviceAddress = address;
         buffer_map[address] = buffer_state->createInfo.size;
     }
 }