diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 0d7269414e7..7bc7193aa03 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -572,7 +572,9 @@ public enum Config {
             return "TemplateManager";
         } else if (_componentClass == VpcManager.class) {
             return "VpcManager";
-        }else {
+        } else if (_componentClass == SnapshotManager.class) {
+            return "SnapshotManager";
+        } else {
             return "none";
         }
     }
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 3f25c3b7e59..de4b7658461 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2221,4 +2221,6 @@ CREATE VIEW `cloud`.`account_vmstats_view` AS
         `cloud`.`vm_instance`
     where
         vm_type = 'User'
-    group by account_id , state;
\ No newline at end of file
+    group by account_id , state;
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Snapshots', 'DEFAULT', 'SnapshotManager', 'KVM.snapshot.enabled', 'false', 'whether snapshot is enabled for KVM hosts');
\ No newline at end of file