diff --git a/src/js/messaging.js b/src/js/messaging.js
index 5b442fc11..a0c9a1e4f 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -190,7 +190,10 @@ const onMessage = function(request, sender, callback) {
 
     case 'userSettings':
         response = µb.changeUserSettings(request.name, request.value);
-        if ( vAPI.net.canUncloakCnames !== true ) {
+        if (
+            vAPI.net.canUncloakCnames !== true &&
+            response instanceof Object
+        ) {
             response.cnameUncloakEnabled = undefined;
         }
         break;