diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 68e59e0a8..f31ad0864 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -328,11 +328,11 @@ int Client::GetStampsCount()
 
 vector<string> Client::GetStamps(int start, int count)
 {
-	//if(start+count > stampIDs.size()) {
-	//	if(start > stampIDs.size())
-	//		return vector<string>();
-	//	count = stampIDs.size()-start;
-	//}
+	if(start+count > stampIDs.size()) {
+		if(start > stampIDs.size())
+			return vector<string>();
+		count = stampIDs.size()-start;
+	}
 
 	vector<string> stampRange;
 	int index = 0;