diff --git a/daemon/fw/unsolicited-data-policy.hpp b/daemon/fw/unsolicited-data-policy.hpp
index 06354d0..f6ca771 100644
--- a/daemon/fw/unsolicited-data-policy.hpp
+++ b/daemon/fw/unsolicited-data-policy.hpp
@@ -99,7 +99,7 @@
 
 /** \brief the default UnsolicitedDataPolicy
  */
-typedef AdmitLocalUnsolicitedDataPolicy DefaultUnsolicitedDataPolicy;
+typedef DropAllUnsolicitedDataPolicy DefaultUnsolicitedDataPolicy;
 
 } // namespace fw
 } // namespace nfd
diff --git a/nfd.conf.sample.in b/nfd.conf.sample.in
index ceaa246..601dc92 100644
--- a/nfd.conf.sample.in
+++ b/nfd.conf.sample.in
@@ -51,7 +51,7 @@
 
   ; Set a policy to decide whether to cache or drop unsolicited Data.
   ; Available policies are: drop-all, admit-local, admit-network, admit-all
-  cs_unsolicited_policy admit-local
+  cs_unsolicited_policy drop-all
 
   ; Set the forwarding strategy for the specified prefixes:
   ;   <prefix> <strategy>
diff --git a/tests/daemon/fw/unsolicited-data-policy.t.cpp b/tests/daemon/fw/unsolicited-data-policy.t.cpp
index a858758..fd6b020 100644
--- a/tests/daemon/fw/unsolicited-data-policy.t.cpp
+++ b/tests/daemon/fw/unsolicited-data-policy.t.cpp
@@ -93,7 +93,7 @@
 };
 
 typedef boost::mpl::vector<
-  FaceScopePolicyTest<void, true, false>, // default policy
+  FaceScopePolicyTest<void, false, false>, // default policy
   FaceScopePolicyTest<DropAllUnsolicitedDataPolicy, false, false>,
   FaceScopePolicyTest<AdmitLocalUnsolicitedDataPolicy, true, false>,
   FaceScopePolicyTest<AdmitNetworkUnsolicitedDataPolicy, false, true>,