diff --git a/linux/map.jinja b/linux/map.jinja
index 0e2c37e..3c17e51 100644
--- a/linux/map.jinja
+++ b/linux/map.jinja
@@ -124,9 +124,7 @@
 {% set storage = salt['grains.filter_by']({
     'Arch': {
         'mount': {},
-        'swap': {
-             'enabled': True,
-         },
+        'swap': {},
         'lvm': {},
         'multipath': {
              'enabled': False,
@@ -136,9 +134,7 @@
     },
     'Debian': {
         'mount': {},
-        'swap': {
-             'enabled': True,
-         },
+        'swap': {},
         'lvm': {},
         'multipath': {
              'enabled': False,
@@ -149,9 +145,7 @@
     },
     'RedHat': {
         'mount': {},
-        'swap': {
-             'enabled': True,
-         },
+        'swap': {},
         'lvm': {},
         'multipath': {
              'enabled': False,
diff --git a/linux/meta/sensu.yml b/linux/meta/sensu.yml
index f7c4d61..06a3775 100644
--- a/linux/meta/sensu.yml
+++ b/linux/meta/sensu.yml
@@ -18,7 +18,7 @@
     occurrences: 1
     subscribers:
     - local-linux-system
-{%- if storage.swap.enabled %}
+{%- if storage.swap is defined %}
   local_linux_storage_swap_usage_{{ system.name|replace('.', '-') }}-{{ system.domain|replace('.', '-') }}:
     command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_swap -a -w 50% -c 20%"
     interval: 60