diff --git a/src/passes/MakeSharedObjects.cpp b/src/passes/MakeSharedObjects.cpp
index 6c598a60ce9..71af94ac74b 100644
--- a/src/passes/MakeSharedObjects.cpp
+++ b/src/passes/MakeSharedObjects.cpp
@@ -183,6 +183,7 @@ struct MakeSharedObjects
       return;
     }
     if (!castHeapType.isSignature()) {
+      updateType(curr->castType);
       return;
     }
     Builder builder(*getModule());
@@ -224,6 +225,7 @@ struct MakeSharedObjects
       return;
     }
     if (!castHeapType.isSignature()) {
+      updateType(curr->type);
       return;
     }
     if (getPassOptions().trapsNeverHappen) {
diff --git a/test/lit/passes/make-shared-objects.wast b/test/lit/passes/make-shared-objects.wast
index a3343911cb9..efd48f7ed83 100644
--- a/test/lit/passes/make-shared-objects.wast
+++ b/test/lit/passes/make-shared-objects.wast
@@ -616,9 +616,13 @@
 
   ;; CHECK:      (type $10 (func (result (ref null (shared i31)))))
 
-  ;; CHECK:      (type $11 (func (param (ref null $struct)) (result i32)))
+  ;; CHECK:      (type $11 (func (param (ref null (shared any))) (result i32)))
 
-  ;; CHECK:      (type $12 (func (param (ref null $struct)) (result (ref null $struct))))
+  ;; CHECK:      (type $12 (func (param (ref null $struct)) (result i32)))
+
+  ;; CHECK:      (type $13 (func (param (ref null (shared any))) (result (ref null (shared i31)))))
+
+  ;; CHECK:      (type $14 (func (param (ref null $struct)) (result (ref null $struct))))
 
   ;; CHECK:      (table $funcs 0 0 funcref)
 
@@ -696,6 +700,15 @@
     (ref.test (ref null (shared nofunc)) (local.get 0))
   )
 
+  ;; CHECK:      (func $ref-test-i31 (type $11) (param $0 (ref null (shared any))) (result i32)
+  ;; CHECK-NEXT:  (ref.test (ref null (shared i31))
+  ;; CHECK-NEXT:   (local.get $0)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $ref-test-i31 (param (ref null any)) (result i32)
+    (ref.test (ref null i31) (local.get 0))
+  )
+
   ;; CHECK:      (func $ref-test-no-nulls (type $5) (param $0 (ref (shared i31))) (result i32)
   ;; CHECK-NEXT:  (ref.test (ref $shared-sig)
   ;; CHECK-NEXT:   (table.get $funcs
@@ -900,7 +913,7 @@
   )
 
   ;; ref.test of non-function type.
-  ;; CHECK:      (func $ref-test-non-func (type $11) (param $0 (ref null $struct)) (result i32)
+  ;; CHECK:      (func $ref-test-non-func (type $12) (param $0 (ref null $struct)) (result i32)
   ;; CHECK-NEXT:  (ref.test (ref null $struct)
   ;; CHECK-NEXT:   (local.get $0)
   ;; CHECK-NEXT:  )
@@ -982,6 +995,15 @@
     (ref.cast (ref null (shared nofunc)) (local.get 0))
   )
 
+  ;; CHECK:      (func $ref-cast-i31 (type $13) (param $0 (ref null (shared any))) (result (ref null (shared i31)))
+  ;; CHECK-NEXT:  (ref.cast (ref null (shared i31))
+  ;; CHECK-NEXT:   (local.get $0)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $ref-cast-i31 (param (ref null any)) (result (ref null i31))
+    (ref.cast (ref null i31) (local.get 0))
+  )
+
   ;; CHECK:      (func $ref-cast-no-nulls (type $9) (param $0 (ref (shared i31))) (result (ref (shared i31)))
   ;; CHECK-NEXT:  (local $1 (ref (shared i31)))
   ;; CHECK-NEXT:  (if (result (ref (shared i31)))
@@ -1283,7 +1305,7 @@
     (ref.cast (ref null $sig) (unreachable))
   )
 
-  ;; CHECK:      (func $ref-cast-non-func (type $12) (param $0 (ref null $struct)) (result (ref null $struct))
+  ;; CHECK:      (func $ref-cast-non-func (type $14) (param $0 (ref null $struct)) (result (ref null $struct))
   ;; CHECK-NEXT:  (ref.cast (ref null $struct)
   ;; CHECK-NEXT:   (local.get $0)
   ;; CHECK-NEXT:  )