diff --git a/setup/so-functions b/setup/so-functions
index f53b696b1..06f845737 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1202,11 +1202,11 @@ es_heapsize() {
 		ES_HEAP_SIZE="25000m"
 	else
 		# Set heap size to 33% of available memory
-		ES_HEAP_SIZE=$(( total_mem / 3 ))"m"
+		ES_HEAP_SIZE=$(( total_mem / 3 ))
 		if [ "$ES_HEAP_SIZE" -ge 25001 ] ; then
 		    ES_HEAP_SIZE="25000m"
 		else
-		    ES_HEAP_SIZE=$ES_HEAP_SIZE
+		    ES_HEAP_SIZE=$ES_HEAP_SIZE"m"
 		fi
 	fi
 	export ES_HEAP_SIZE