diff --git a/uninstall-nodemgmt.sh b/uninstall-nodemgmt.sh
index 8e00228..c616999 100755
--- a/uninstall-nodemgmt.sh
+++ b/uninstall-nodemgmt.sh
@@ -16,6 +16,11 @@ do_with_root set -eu
 rm -f /usr/local/bin/nodemgmt
 rm -Rf /opt/idssys/nodemgmt
 
+IDSSYSF="`ls -l /opt/idssys/ | grep -c ^d`"
+if [ "$IDSSYSF" = 1 ]; then
+	rm -Rf /opt/idssys	
+fi
+
 echo ""
 echo -e "${CS[color,LightRed]}NodeMgmt has been Removed${CS[color,Default]}"
 echo ""