diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index e5a89c76c..982e359dd 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -56,11 +56,8 @@
 //= require_directory ./access_permissions
 //= require sidebar
 //= require turbolinks
-
-<% if Rails.configuration.x.zebra_print_enabled %>
-  //= require 'BrowserPrint-3.0.216.min'
-  //= require 'BrowserPrint-Zebra-1.0.216.min'
-<% end %>
+//= require 'BrowserPrint-3.0.216.min'
+//= require 'BrowserPrint-Zebra-1.0.216.min'
 
 // Initialize links for submitting forms. This is useful for submitting
 // forms with clicking on links outside form in cases when other than
diff --git a/app/assets/javascripts/sitewide/zebra_print.js b/app/assets/javascripts/sitewide/zebra_print.js
index ff8f96f4f..39480d6fc 100644
--- a/app/assets/javascripts/sitewide/zebra_print.js
+++ b/app/assets/javascripts/sitewide/zebra_print.js
@@ -96,7 +96,7 @@ var zebraPrint = (function() {
     try {
       beforeRefresh();
       BrowserPrint.getLocalDevices(function(deviceList) {
-        if (deviceList.printer && deviceList.printer.length !== 0) {
+        if (deviceList && deviceList.printer && deviceList.printer.length !== 0) {
           for (i = 0; i < deviceList.printer.length; i += 1) {
             getPrinterStatus(deviceList.printer[i]).then((device) => {
               addNewDevice(device, clearSelectorOnFirstDevice);