diff --git a/models/site.rb b/models/site.rb
index 856e9251..e42e7b1f 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -1021,6 +1021,11 @@ class Site < Sequel::Model
         $redis_proxy.hset d_www_key,  'ssl_cert', ssl_cert
         $redis_proxy.hset d_www_key,  'ssl_key',  ssl_key
       end
+
+      if is_deleted
+        $redis_proxy.del d_root_key
+        $redis_proxy.del d_www_key
+      end
     else
       $redis_proxy.hdel u_key, 'domain'
     end
@@ -1031,8 +1036,6 @@ class Site < Sequel::Model
 
     if is_deleted
       $redis_proxy.del u_key
-      $redis_proxy.del(d_root_key) if defined?(d_root_key)
-      $redis_proxy.del(d_www_key) if defined?(d_www_key)
     end
 
     true