diff --git a/ibm_vpd_app.cpp b/ibm_vpd_app.cpp
index a1ac0c6..9464405 100644
--- a/ibm_vpd_app.cpp
+++ b/ibm_vpd_app.cpp
@@ -336,13 +336,16 @@
     }
 
     // TODO: Figure out a better way to get max possible VPD size.
+    auto maxVPDSize = std::min(std::filesystem::file_size(file),
+                               static_cast<uintmax_t>(65504));
+
     Binary vpdVector;
-    vpdVector.resize(65504);
+    vpdVector.resize(maxVPDSize);
     ifstream vpdFile;
     vpdFile.open(file, ios::binary);
 
     vpdFile.seekg(offset, ios_base::cur);
-    vpdFile.read(reinterpret_cast<char*>(&vpdVector[0]), 65504);
+    vpdFile.read(reinterpret_cast<char*>(&vpdVector[0]), maxVPDSize);
     vpdVector.resize(vpdFile.gcount());
 
     return vpdVector;