diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb
index cec4508c..919e4389 100755
--- a/web/documentserver-example/ruby/app/controllers/home_controller.rb
+++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb
@@ -153,7 +153,7 @@ class HomeController < ApplicationController
       file = params[:file]
       isEmbedded = params[:dmode]
 
-      if JwtHelper.is_enabled
+      if JwtHelper.is_enabled && JwtHelper.use_for_request
         jwtHeader = Rails.configuration.header.empty? ? "Authorization" : Rails.configuration.header;
         if request.headers[jwtHeader]
           hdr = request.headers[jwtHeader]
@@ -272,7 +272,7 @@ class HomeController < ApplicationController
       user_address = params[:userAddress]
       isEmbedded = params[:dmode]
 
-      if JwtHelper.is_enabled && isEmbedded == nil && user_address != nil && Rails.configuration.token_use_for_request
+      if JwtHelper.is_enabled && isEmbedded == nil && user_address != nil && JwtHelper.use_for_request
         jwtHeader = Rails.configuration.header.empty? ? "Authorization" : Rails.configuration.header;
         if request.headers[jwtHeader]
             hdr = request.headers[jwtHeader]
diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb
index 099f8286..40aed30b 100755
--- a/web/documentserver-example/ruby/app/models/service_converter.rb
+++ b/web/documentserver-example/ruby/app/models/service_converter.rb
@@ -59,7 +59,7 @@ class ServiceConverter
         req.add_field("Accept", "application/json")  # set headers
         req.add_field("Content-Type", "application/json")
 
-        if JwtHelper.is_enabled  # if the signature is enabled
+        if JwtHelper.is_enabled && JwtHelper.use_for_request  # if the signature is enabled
           payload["token"] = JwtHelper.encode(payload)  # get token and save it to the payload
           jwtHeader = Rails.configuration.header.empty? ? "Authorization" : Rails.configuration.header;  # get signature authorization header
           req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}")  # set it to the request with the Bearer prefix
diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb
index 1f946c9f..12320b73 100755
--- a/web/documentserver-example/ruby/app/models/track_helper.rb
+++ b/web/documentserver-example/ruby/app/models/track_helper.rb
@@ -31,7 +31,7 @@ class TrackHelper
             file_data = JSON.parse(body)  # parse file data
 
             # check if a secret key to generate token exists or not
-            if JwtHelper.is_enabled
+            if JwtHelper.is_enabled && JwtHelper.use_for_request
                 inHeader = false
                 token = nil
                 jwtHeader = Rails.configuration.header.empty? ? "Authorization" : Rails.configuration.header;  # get the authorization header from the config
@@ -234,7 +234,7 @@ class TrackHelper
                 req = Net::HTTP::Post.new(uri.request_uri)  # create the post request
                 req.add_field("Content-Type", "application/json")  # set headers
 
-                if JwtHelper.is_enabled  # if the signature is enabled
+                if JwtHelper.is_enabled && JwtHelper.use_for_request  # if the signature is enabled
                     payload["token"] = JwtHelper.encode(payload)  # get token and save it to the payload
                     jwtHeader = Rails.configuration.header.empty? ? "Authorization" : Rails.configuration.header;  # get signature authorization header
                     req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}")  # set it to the request with the Bearer prefix