diff --git a/Squello-Core.package/SPBColumn.class/instance/isLastCard..st b/Squello-Core.package/SPBColumn.class/instance/isLastCard..st
index a3a46d41..c9924d91 100644
--- a/Squello-Core.package/SPBColumn.class/instance/isLastCard..st
+++ b/Squello-Core.package/SPBColumn.class/instance/isLastCard..st
@@ -1,4 +1,5 @@
 accessing
 isLastCard: anSPBCard
 
+	self cards isEmpty ifTrue: [^ false].
 	^ self cards last = anSPBCard.
\ No newline at end of file
diff --git a/Squello-Core.package/SPBColumn.class/methodProperties.json b/Squello-Core.package/SPBColumn.class/methodProperties.json
index 7ff7f5d7..7e868728 100644
--- a/Squello-Core.package/SPBColumn.class/methodProperties.json
+++ b/Squello-Core.package/SPBColumn.class/methodProperties.json
@@ -50,7 +50,7 @@
 		"initializeBottomDetection" : "mcr 7/19/2022 13:18",
 		"initializeIndicator" : "lo 8/1/2022 12:27",
 		"isColumn" : "lo 8/1/2022 14:49",
-		"isLastCard:" : "NTK 7/30/2022 11:10",
+		"isLastCard:" : "FP 5/28/2024 12:01",
 		"jsonCards" : "lo 6/8/2022 10:19",
 		"jsonCards:" : "LW 7/14/2022 11:12",
 		"minimumHeight" : "LW 7/14/2022 11:32",
diff --git a/Squello-Tests.package/SPBColumnTests.class/instance/testLastCardInEmpty.st b/Squello-Tests.package/SPBColumnTests.class/instance/testLastCardInEmpty.st
new file mode 100644
index 00000000..a2bf9fcd
--- /dev/null
+++ b/Squello-Tests.package/SPBColumnTests.class/instance/testLastCardInEmpty.st
@@ -0,0 +1,6 @@
+tests
+testLastCardInEmpty
+
+	| card |
+	card := SPBCard new id: 42.
+	self assert: false equals: (column isLastCard: card).
\ No newline at end of file
diff --git a/Squello-Tests.package/SPBColumnTests.class/methodProperties.json b/Squello-Tests.package/SPBColumnTests.class/methodProperties.json
index 28d03d79..bebbaccd 100644
--- a/Squello-Tests.package/SPBColumnTests.class/methodProperties.json
+++ b/Squello-Tests.package/SPBColumnTests.class/methodProperties.json
@@ -17,6 +17,7 @@
 		"testChangeIndexOfColumn" : "mcr 8/1/2022 02:10",
 		"testId" : "tk 7/30/2022 23:34",
 		"testIsLastCard" : "mcr 8/1/2022 02:40",
+		"testLastCardInEmpty" : "FP 5/28/2024 12:01",
 		"testMoveColumn" : "lo 8/1/2022 16:34",
 		"testNewFrom" : "tk 7/30/2022 23:36",
 		"testProvider" : "tk 7/30/2022 23:34",