diff --git a/src/nix/main.cc b/src/nix/main.cc
index d3d2f5b1658..ed9929018a9 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -365,6 +365,7 @@ void mainWrapped(int argc, char * * argv)
 
     if (args.command->first != "repl"
         && args.command->first != "doctor"
+        && args.command->first != "store"
         && args.command->first != "upgrade-nix")
         settings.requireExperimentalFeature(Xp::NixCommand);
 
diff --git a/src/nix/store.cc b/src/nix/store.cc
index 44e53c7c758..3ee1c5bc5f0 100644
--- a/src/nix/store.cc
+++ b/src/nix/store.cc
@@ -18,6 +18,10 @@ struct CmdStore : virtual NixMultiCommand
     {
         if (!command)
             throw UsageError("'nix store' requires a sub-command.");
+
+        if (command->first != "gc")
+            settings.requireExperimentalFeature(Xp::NixCommand);
+
         command->second->prepare();
         command->second->run();
     }