diff --git a/src/upgrade.js b/src/upgrade.js
index 9ed3b6daac..e517185f2b 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -430,7 +430,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);
 							}