diff --git a/powerwall.sh b/powerwall.sh
index c9ed14ef..47c9b286 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1229,21 +1229,32 @@ HOSTPOWER(){
 }
 
 LOGROTATE(){
-	STOPALL_SERVICES
-	lm=`expr $(date +'%m') - 1`
-	if [ $lm = 0 ]; then
-		lm=12
-		ly=`expr $(date +'%Y') - 1`
-	else
-		ly=$(date +'%Y')
-	fi
-	ARCHIVEFOLDER=${PW_LOGARCHIVE}/${ly}-${lm}
-	mkdir -p ${ARCHIVEFOLDER}
-	mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/
-	mv ${PW_LOGFOLDER}/service.* ${ARCHIVEFOLDER}/
-	# source ${PW_FOLDER}/defaults.inc
-	sleep 5s
-	STARTALL_SERVICES
+	# STOPALL_SERVICES
+	# lm=`expr $(date +'%m') - 1`
+	# if [ $lm = 0 ]; then
+	# 	lm=12
+	# 	ly=`expr $(date +'%Y') - 1`
+	# else
+	# 	ly=$(date +'%Y')
+	# fi
+	# ARCHIVEFOLDER=${PW_LOGARCHIVE}/${ly}-${lm}
+	# mkdir -p ${ARCHIVEFOLDER}
+	# mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/
+	# mv ${PW_LOGFOLDER}/service.* ${ARCHIVEFOLDER}/
+	# # source ${PW_FOLDER}/defaults.inc
+	# sleep 5s
+	# STARTALL_SERVICES
+	
+	backupstokeep=(`ls -d ${PW_LOGARCHIVE}/* 2> /dev/null | tail -12`)
+	for folder in $(ls -d ${PW_LOGARCHIVE}/*); do
+		keep=0
+		for file in ${backupstokeep[@]}; do
+			if [ "${folder}" == "${file}" ]; then
+				keep=1; break
+			fi
+		done;
+		[ $keep == 0 ] && rm -Rf ${folder}
+	done
 }
 
 GET_SNAPSHOTS(){