diff --git a/src/frontend/org/voltdb/sysprocs/saverestore/NativeSnapshotWritePlan.java b/src/frontend/org/voltdb/sysprocs/saverestore/NativeSnapshotWritePlan.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/sysprocs/saverestore/NativeSnapshotWritePlan.java
+++ b/src/frontend/org/voltdb/sysprocs/saverestore/NativeSnapshotWritePlan.java
@@ -103,7 +103,7 @@ public class NativeSnapshotWritePlan extends SnapshotWritePlan
 
         final SnapshotRequestConfig config = new SnapshotRequestConfig(jsData, context.getDatabase());
         final Table[] tableArray;
-        if (config.tables.length == 0) {
+        if (config.tables.length == 0 && !jsData.has("tables")) {
             tableArray = SnapshotUtil.getTablesToSave(context.getDatabase()).toArray(new Table[0]);
         } else {
             tableArray = config.tables;
ENG-<I>: Allow generation of a zero-table native snapshot