diff --git a/src/upgrade.js b/src/upgrade.js
index b000a524b2..45f213e727 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -336,7 +336,7 @@ Upgrade.upgrade = function (callback) {
 						var keys = ['chat-incoming', 'chat-outgoing', 'notification'];
 
 						db.getObject('settings:sounds', function (err, settings) {
-							if (err) {
+							if (err || !settings) {
 								return cb(err);
 							}