diff --git a/display/connection.c b/display/connection.c
index cef4832c..d3c7d7b7 100644
--- a/display/connection.c
+++ b/display/connection.c
@@ -304,11 +304,11 @@ CONNECTION_MESSAGE_HANDLER_NO_AUX_SERVER(request_display_modes)
 		failure.error = EINVAL;
 	else
 	{
-		size_t modes_count;
+		size_t modes_count = 0;
 		modes = get_available_modes(&server->display->display, &modes_count);
 		if ( !modes )
 			failure.error = errno;
-		if ( (uint32_t) modes_count != modes_count )
+		else if ( (uint32_t) modes_count != modes_count )
 		{
 			failure.error = EOVERFLOW;
 			free(modes);