diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index ef3f507c..96c78d76 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -248,7 +248,9 @@ export default Vue.extend({
           return
         }
         const textDecode = new TextDecoder('utf-8').decode(data)
-        const youtubeSubscriptions = textDecode.split('\n')
+        const youtubeSubscriptions = textDecode.split('\n').filter(sub => {
+          return sub !== ''
+        })
         const primaryProfile = JSON.parse(JSON.stringify(this.profileList[0]))
         const subscriptions = []
 
@@ -855,7 +857,11 @@ export default Vue.extend({
       let exportText = 'Channel ID,Channel URL,Channel title\n'
       this.profileList[0].subscriptions.forEach((channel) => {
         const channelUrl = `https://www.youtube.com/channel/${channel.id}`
-        exportText += `${channel.id},${channelUrl},${channel.name}\n`
+        let channelName = channel.name
+        if (channelName.search(',') !== -1) { // add quotations if channel has comma in name
+          channelName = `"${channelName}"`
+        }
+        exportText += `${channel.id},${channelUrl},${channelName}\n`
       })
       exportText += '\n'
       const response = await this.showSaveDialog(options)