diff --git a/src/commands/index.ts b/src/commands/index.ts
index 23101291be1668478450dfba52bf31de7daa2228..100b8b5f98de64079ce2159b254f0ecd5a17cd24 100644
--- a/src/commands/index.ts
+++ b/src/commands/index.ts
@@ -32,7 +32,10 @@ const getCommand = (
   version: USPVersion,
   commandType: CommandType
 ): CommandObject | null =>
-  versionSpecificCommands[version][commandType] || common[commandType] || null;
+  version in versionSpecificCommands &&
+  commandType in versionSpecificCommands[version]
+    ? versionSpecificCommands[version][commandType]
+    : common[commandType] || null;
 
 const recipes: RecipeObject[] = [resolve as any, operateRecipe, subscribe];