diff --git a/src/lualib/ObjectAssign.ts b/src/lualib/ObjectAssign.ts
index a7f691433..7d0a3a9b1 100644
--- a/src/lualib/ObjectAssign.ts
+++ b/src/lualib/ObjectAssign.ts
@@ -2,8 +2,10 @@
 export function __TS__ObjectAssign<T extends object>(this: void, target: T, ...sources: T[]): T {
     for (const i of $range(1, sources.length)) {
         const source = sources[i - 1];
-        for (const key in source) {
-            target[key] = source[key];
+        if (type(source) === "table") {
+            for (const key in source) {
+                target[key] = source[key];
+            }
         }
     }
 
diff --git a/test/unit/builtins/object.spec.ts b/test/unit/builtins/object.spec.ts
index dfed73502..192f17d9f 100644
--- a/test/unit/builtins/object.spec.ts
+++ b/test/unit/builtins/object.spec.ts
@@ -10,6 +10,16 @@ test.each([
     util.testExpression`Object.assign(${util.formatCode(initial)}, ${argsString})`.expectToMatchJsResult();
 });
 
+test.each([
+    "Object.assign({}, false)",
+    "Object.assign({}, null)",
+    "Object.assign({}, undefined)",
+    "Object.assign({}, null, undefined)",
+    "Object.assign({ a: 1 }, false, { b: 2 })",
+])("Object.assign skips non-object sources (%p)", expression => {
+    util.testExpression(expression).expectToMatchJsResult();
+});
+
 test.each([{}, { abc: 3 }, { abc: 3, def: "xyz" }])("Object.entries (%p)", obj => {
     const testBuilder = util.testExpressionTemplate`Object.entries(${obj})`;
     // Need custom matcher because order is not guaranteed in neither JS nor Lua
diff --git a/test/unit/spread.spec.ts b/test/unit/spread.spec.ts
index 53898aae5..79262c185 100644
--- a/test/unit/spread.spec.ts
+++ b/test/unit/spread.spec.ts
@@ -119,6 +119,15 @@ describe("in object literal", () => {
         util.testExpression(expression).expectToMatchJsResult();
     });
 
+    test.each([
+        "{ ...((false && { a: 1 }) as any) }",
+        "{ ...((true && { a: 1 }) as any) }",
+        "{ a: 1, ...((false && { b: 2 }) as any) }",
+        "{ ...(null as any), ...(undefined as any) }",
+    ])("of short-circuited operand (%p)", expression => {
+        util.testExpression(expression).expectToMatchJsResult();
+    });
+
     test("of object reference", () => {
         util.testFunction`
             const object = { x: 0, y: 1 };