diff --git a/hercules_opt/src/gvn.rs b/hercules_opt/src/gvn.rs
index 5f7138e5ee691f6288248d6f18866efd0116dc42..69ed8e4af75a318d22a14bbbd0b48d298ff62bdf 100644
--- a/hercules_opt/src/gvn.rs
+++ b/hercules_opt/src/gvn.rs
@@ -31,7 +31,10 @@ pub fn gvn(editor: &mut FunctionEditor, gvn_constants_and_clones: bool) {
             // Also, don't GVN constants and clones if indicated to not do so.
             if *number == work
                 || (!gvn_constants_and_clones
-                    && (editor.func().nodes[work.idx()].is_constant()
+                    && (editor.func().nodes[work.idx()]
+                        .try_constant()
+                        .map(|cons_id| !editor.get_constant(cons_id).is_scalar())
+                        .unwrap_or(false)
                         || editor.func().nodes[work.idx()]
                             .try_write()
                             .map(|(_, _, indices)| indices.is_empty())