diff --git a/core/src/main/java/org/glassfish/tyrus/core/Handshake.java b/core/src/main/java/org/glassfish/tyrus/core/Handshake.java
index 05e07387..1ed30f23 100644
--- a/core/src/main/java/org/glassfish/tyrus/core/Handshake.java
+++ b/core/src/main/java/org/glassfish/tyrus/core/Handshake.java
@@ -209,7 +209,6 @@ public static void updateHostAndOrigin(final UpgradeRequest upgradeRequest) {
 
         Map<String, List<String>> requestHeaders = upgradeRequest.getHeaders();
         requestHeaders.put(UpgradeRequest.HOST, Collections.singletonList(host));
-        requestHeaders.put(UpgradeRequest.ORIGIN_HEADER, Collections.singletonList("http://" + host));
     }
 
     /**
diff --git a/tests/e2e/standard-config/src/test/java/org/glassfish/tyrus/test/standard_config/OriginTest.java b/tests/e2e/standard-config/src/test/java/org/glassfish/tyrus/test/standard_config/OriginTest.java
index 57e65049..b9d4d3f0 100644
--- a/tests/e2e/standard-config/src/test/java/org/glassfish/tyrus/test/standard_config/OriginTest.java
+++ b/tests/e2e/standard-config/src/test/java/org/glassfish/tyrus/test/standard_config/OriginTest.java
@@ -97,7 +97,7 @@ public static class AnotherServerConfigurator extends ServerEndpointConfig.Confi
         @Override
         public boolean checkOrigin(String originHeaderValue) {
 
-            if (!originHeaderValue.startsWith("http://")) {
+            if (originHeaderValue != null && !originHeaderValue.startsWith("http://")) {
                 return false;
             } else {
                 return true;