diff --git a/lib/App/Netdisco/Util/Device.pm b/lib/App/Netdisco/Util/Device.pm
index 7b6ded33..f86d6af2 100644
--- a/lib/App/Netdisco/Util/Device.pm
+++ b/lib/App/Netdisco/Util/Device.pm
@@ -192,7 +192,8 @@ sub is_discoverable_now {
   my ($ip, $remote_type) = @_;
   my $device = get_device($ip) or return 0;
 
-  if ($device->since_last_discover and setting('discover_min_age')
+  if ($device->in_storage
+      and $device->since_last_discover and setting('discover_min_age')
       and $device->since_last_discover < setting('discover_min_age')) {
 
       return _bail_msg("is_discoverable: time since last discover less than discover_min_age");
@@ -240,7 +241,8 @@ sub is_arpnipable_now {
   my ($ip) = @_;
   my $device = get_device($ip) or return 0;
 
-  if ($device->since_last_arpnip and setting('arpnip_min_age')
+  if ($device->in_storage
+      and $device->since_last_arpnip and setting('arpnip_min_age')
       and $device->since_last_arpnip < setting('arpnip_min_age')) {
 
       return _bail_msg("is_arpnipable: time since last arpnip less than arpnip_min_age");
@@ -288,7 +290,8 @@ sub is_macsuckable_now {
   my ($ip) = @_;
   my $device = get_device($ip) or return 0;
 
-  if ($device->since_last_macsuck and setting('macsuck_min_age')
+  if ($device->in_storage
+      and $device->since_last_macsuck and setting('macsuck_min_age')
       and $device->since_last_macsuck < setting('macsuck_min_age')) {
 
       return _bail_msg("is_macsuckable: time since last macsuck less than macsuck_min_age");