diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index 6ca40298d8..c41b500183 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -555,8 +555,7 @@ helpers do
         zone.info
 
         url_one_zone = zone.retrieve_elements("TEMPLATE/ONEFLOW_ENDPOINT")
-        url_zone = zone.retrieve_elements("TEMPLATE/ENDPOINT")
-        session[:zone_flow_url] = (url_one_zone && url_one_zone[0]) || parse_flow_url(url_zone[0])
+        session[:zone_flow_url] = (url_one_zone && url_one_zone[0]) || $conf[:oneflow_server]
 
         session[:zone_name] = zone.name
         session[:zone_id]   = zone.id
@@ -588,14 +587,6 @@ helpers do
         session.destroy
         [204, ""]
     end
-
-    def parse_flow_url(endpoint)
-      if endpoint
-        uri = URI(endpoint.to_s)
-        flow_uri = URI($conf[:oneflow_server])
-        return "#{uri.scheme}://#{uri.host}:#{flow_uri.port}"
-      end
-    end
 end
 
 before do
@@ -657,7 +648,7 @@ before do
                     halt [500, OpenNebula::Error.new(msg).to_json]
                 end
 
-                session[:zone_flow_url] = z['TEMPLATE/ONEFLOW_ENDPOINT'] || parse_flow_url(z['TEMPLATE/ENDPOINT'])
+                session[:zone_flow_url] = z['TEMPLATE/ONEFLOW_ENDPOINT'] || $conf[:oneflow_server]
                 session[:active_zone_endpoint] = z['TEMPLATE/ENDPOINT']
                 session[:zone_name] = zone_name_header
                 session[:zone_id]   = z.id