diff --git a/src/Processors/Transforms/AddingDefaultsTransform.cpp b/src/Processors/Transforms/AddingDefaultsTransform.cpp
index 01048354b82..82c235d9034 100644
--- a/src/Processors/Transforms/AddingDefaultsTransform.cpp
+++ b/src/Processors/Transforms/AddingDefaultsTransform.cpp
@@ -187,7 +187,7 @@ void AddingDefaultsTransform::transform(Chunk & chunk)
     {
         const String & column_name = column_def.name;
 
-        if (column_defaults.count(column_name) == 0)
+        if (column_defaults.count(column_name) == 0 || !res.has(column_name))
             continue;
 
         size_t block_column_position = res.getPositionByName(column_name);
diff --git a/tests/queries/0_stateless/01016_input_null_as_default.reference b/tests/queries/0_stateless/01016_input_null_as_default.reference
index d7010f42d4e..7a84006caf7 100644
--- a/tests/queries/0_stateless/01016_input_null_as_default.reference
+++ b/tests/queries/0_stateless/01016_input_null_as_default.reference
@@ -33,3 +33,9 @@ Values
 1	world	3	2019-07-23	[1,2,3]	('tuple',3.14)
 2	Hello	123	2019-06-19	[]	('test',2.71828)
 3	Hello	42	2019-06-19	[1,2,3]	('default',0.75)
+default_by_other_column
+1	2	('tuple',3)
+10	10	('default',2.5)
+100	100	('default',25)
+100	100	('default',25)
+100	100	('default',25)
diff --git a/tests/queries/0_stateless/01016_input_null_as_default.sh b/tests/queries/0_stateless/01016_input_null_as_default.sh
index bfeaca0fcac..24d93b2703c 100755
--- a/tests/queries/0_stateless/01016_input_null_as_default.sh
+++ b/tests/queries/0_stateless/01016_input_null_as_default.sh
@@ -5,7 +5,9 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS null_as_default";
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS default_by_other_column";
 $CLICKHOUSE_CLIENT --query="CREATE TABLE null_as_default (i Int8, s String DEFAULT 'Hello', n UInt64 DEFAULT 42, d Date DEFAULT '2019-06-19', a Array(UInt8) DEFAULT [1, 2, 3], t Tuple(String, Float64) DEFAULT ('default', i / 4)) ENGINE = Memory";
+$CLICKHOUSE_CLIENT --query="CREATE TABLE default_by_other_column (a Float32 DEFAULT 100, b Float64 DEFAULT a, c Tuple(String, Float64) DEFAULT ('default', b / 4)) ENGINE = Memory";
 
 echo 'CSV'
 echo '\N, 1, \N, "2019-07-22", "[10, 20, 30]", \N
@@ -62,3 +64,12 @@ echo '(NULL, '\''1'\'', (null), '\''2019-07-22'\'', ([10, 20, 30]), (NuLl)),
 (3, null, (null), null, (null), (null))' | $CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO null_as_default VALUES";
 $CLICKHOUSE_CLIENT --query="SELECT * FROM null_as_default ORDER BY i";
 $CLICKHOUSE_CLIENT --query="DROP TABLE null_as_default";
+
+echo 'default_by_other_column'
+$CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO default_by_other_column(c) VALUES(null)";
+$CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO default_by_other_column(b, c) VALUES(null, null)";
+$CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO default_by_other_column(a, b, c) VALUES(null, null, null)";
+$CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO default_by_other_column(a) VALUES(10)";
+$CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO default_by_other_column(a, b, c) VALUES(1, 2, ('tuple', 3))";
+$CLICKHOUSE_CLIENT --query="SELECT * FROM default_by_other_column ORDER BY a";
+$CLICKHOUSE_CLIENT --query="DROP TABLE default_by_other_column";
diff --git a/tests/queries/0_stateless/02205_ephemeral_1.reference b/tests/queries/0_stateless/02205_ephemeral_1.reference
index bad56205b46..6e98ffd2495 100644
--- a/tests/queries/0_stateless/02205_ephemeral_1.reference
+++ b/tests/queries/0_stateless/02205_ephemeral_1.reference
@@ -2,6 +2,7 @@ x	UInt32	DEFAULT	y
 y	UInt32	EPHEMERAL	17			
 z	UInt32	DEFAULT	5			
 1	2
+17	2
 17	5
 7	5
 21	5
diff --git a/tests/queries/0_stateless/02205_ephemeral_1.sql b/tests/queries/0_stateless/02205_ephemeral_1.sql
index 60411a92583..5d0565cbfc0 100644
--- a/tests/queries/0_stateless/02205_ephemeral_1.sql
+++ b/tests/queries/0_stateless/02205_ephemeral_1.sql
@@ -11,9 +11,10 @@ SELECT * FROM t_ephemeral_02205_1;
 
 TRUNCATE TABLE t_ephemeral_02205_1;
 
-# Attempt to use ephemeral through default of ordinary column should end up with error 10 -
-# ephemeral only considered when explicitly mentioned in the columns list
-INSERT INTO t_ephemeral_02205_1 VALUES (DEFAULT, 2); -- { clientError 10 }
+INSERT INTO t_ephemeral_02205_1 VALUES (DEFAULT, 2);
+SELECT * FROM t_ephemeral_02205_1;
+
+TRUNCATE TABLE t_ephemeral_02205_1;
 
 # Test INSERT using ephemerals default
 INSERT INTO t_ephemeral_02205_1 (x, y) VALUES (DEFAULT, DEFAULT);