diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
index bd80f02aa7358..891885a81eb8b 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -366,8 +366,7 @@ define([
                 t,
                 tmpVideoData,
                 currentItem,
-                iconClass = 'video-thumb-icon',
-                videoContainerClass = 'fotorama-video-container';
+                iconClass = 'video-thumb-icon';
 
             if (!fotorama.activeFrame.$navThumbFrame) {
                 $(this.element).on('fotorama:showend', $.proxy(function (evt, fotoramaData) {
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index 5545ae1b51b04..daca8e5bdafac 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -893,7 +893,8 @@ define([
             var justAnImage = images[0],
                 updateImg,
                 imagesToUpdate,
-                gallery = context.find(this.options.mediaGallerySelector).data('gallery');
+                gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
+                item;
 
             if (images) {
                 imagesToUpdate = this._setImageType($.extend(true, [], images));
@@ -905,11 +906,8 @@ define([
                         return img.isMain;
                     });
 
-                    if (updateImg.length) {
-                        gallery.updateDataByIndex(0, updateImg[0]);
-                    } else {
-                        gallery.updateDataByIndex(0, imagesToUpdate[0]);
-                    }
+                    item = updateImg.length ? updateImg[0]: imagesToUpdate[0];
+                    gallery.updateDataByIndex(0, item);
 
                     gallery.seek(1);
                 } else {