diff --git a/app/controllers/wopi_controller.rb b/app/controllers/wopi_controller.rb
index dd7b30192..7b954c71e 100644
--- a/app/controllers/wopi_controller.rb
+++ b/app/controllers/wopi_controller.rb
@@ -70,11 +70,11 @@ class WopiController < ActionController::Base
       UserCanNotWriteRelative:       true,
       CloseUrl:                      @close_url,
       DownloadUrl: url_for(controller: 'assets', action: 'download',
-                           id: @asset.id),
+                           id: @asset.id, host: ENV['WOPI_BREADCRUMBS_HOST']),
       HostEditUrl: url_for(controller: 'assets', action: 'edit',
-                           id: @asset.id),
+                           id: @asset.id, host: ENV['WOPI_BREADCRUMBS_HOST']),
       HostViewUrl: url_for(controller: 'assets', action: 'view',
-                           id: @asset.id),
+                           id: @asset.id, host: ENV['WOPI_BREADCRUMBS_HOST']),
       BreadcrumbBrandName:  @breadcrumb_brand_name,
       BreadcrumbBrandUrl:   @breadcrumb_brand_url,
       BreadcrumbFolderName: @breadcrumb_folder_name,
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 90a58a800..9e674f059 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -380,7 +380,7 @@ class Asset < ActiveRecord::Base
     action = get_action(file_ext, action)
     if !action.nil?
       action_url = action.urlsrc
-      if (ENV['WOPI_BUSINESS_USERS'])
+      if (ENV['WOPI_BUSINESS_USERS'] && ENV['WOPI_BUSINESS_USERS']=='true' )
         action_url = action_url.gsub(/<IsLicensedUser=BUSINESS_USER&>/,
                                      'IsLicensedUser=1&')
         action_url = action_url.gsub(/<IsLicensedUser=BUSINESS_USER>/,