diff --git a/addons/bridge.py b/addons/bridge.py
index 98c5a00..c2de180 100644
--- a/addons/bridge.py
+++ b/addons/bridge.py
@@ -1692,10 +1692,16 @@ class bridge(moduleBase):
         elif self.brctlcmd.is_bridge_port(ifaceobjrunning.name):
             self._query_running_bridge_port(ifaceobjrunning, ifaceobj_getfunc)
 
+    def _query(self, ifaceobj, **kwargs):
+        """ add default policy attributes supported by the module """
+        if self.default_stp_on:
+            ifaceobj.update_config('bridge-stp', 'yes')
+
     _run_ops = {'pre-up' : _up,
                'post-down' : _down,
                'query-checkcurr' : _query_check,
-               'query-running' : _query_running}
+               'query-running' : _query_running,
+               'query' : _query}
 
     def get_ops(self):
         """ returns list of ops supported by this module """
diff --git a/ifupdown/ifupdownmain.py b/ifupdown/ifupdownmain.py
index 16b25bb..a3a8da9 100644
--- a/ifupdown/ifupdownmain.py
+++ b/ifupdown/ifupdownmain.py
@@ -1276,7 +1276,7 @@ class ifupdownMain(ifupdownBase):
         if format_list and (ops[0] == 'query' or ops[0] == 'query-raw'):
             return self.print_ifaceobjs_list(filtered_ifacenames)
 
-        if ops[0] == 'query':
+        if ops[0] == 'query' and not ifupdownflags.flags.WITHDEFAULTS:
             return self.print_ifaceobjs_pretty(filtered_ifacenames, format)
         elif ops[0] == 'query-raw':
             return self.print_ifaceobjs_raw(filtered_ifacenames)
@@ -1285,7 +1285,9 @@ class ifupdownMain(ifupdownBase):
                            followdependents=True
                            if self.flags.WITH_DEPENDS else False)
 
-        if ops[0] == 'query-checkcurr':
+        if ops[0] == 'query' and ifupdownflags.flags.WITHDEFAULTS:
+            return self.print_ifaceobjs_pretty(filtered_ifacenames, format)
+        elif ops[0] == 'query-checkcurr':
             ret = self.print_ifaceobjscurr_pretty(filtered_ifacenames, format)
             if ret != 0:
                 # if any of the object has an error, signal that silently