diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 4776cafc5c4..5f7f596de03 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -1827,6 +1827,8 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
         }
 
         if (cases.isEmpty()) {
+            // still evaluate expression for side-effects.
+            load(expression).pop();
             method.label(breakLabel);
             return false;
         }
diff --git a/nashorn/test/script/basic/JDK-8026033.js b/nashorn/test/script/basic/JDK-8026033.js
new file mode 100644
index 00000000000..4a5d85945d1
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026033.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8026033: Switch should load expression even when there are no cases in it
+ *
+ * @test
+ * @run
+ */
+
+try {
+    (function() { switch(x) {} })();
+    fail("Should have thrown ReferenceError");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("ReferenceError expected, got " + e);
+    }
+    print(e);
+}
diff --git a/nashorn/test/script/basic/JDK-8026033.js.EXPECTED b/nashorn/test/script/basic/JDK-8026033.js.EXPECTED
new file mode 100644
index 00000000000..c007ed7bec4
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026033.js.EXPECTED
@@ -0,0 +1 @@
+ReferenceError: "x" is not defined