diff --git a/udev/udev-block-add-change b/udev/udev-block-add-change
index 791ed97..98e9c4c 100755
--- a/udev/udev-block-add-change
+++ b/udev/udev-block-add-change
@@ -63,8 +63,8 @@ fi
 # The last one is meant to trigger watches
 qubesdb-write \
     "$QDB_KEY/desc" "$DESC" \
-    "$XS_KEY/size" "$SIZE" \
-    "$XS_KEY/mode" "$MODE" \
+    "$QDB_KEY/size" "$SIZE" \
+    "$QDB_KEY/mode" "$MODE" \
     /qubes-block-devices ''
 echo QUBES_EXPOSED=1
 
diff --git a/udev/udev-block-remove b/udev/udev-block-remove
index 8d8d107..ba727ea 100755
--- a/udev/udev-block-remove
+++ b/udev/udev-block-remove
@@ -2,7 +2,9 @@
 
 NAME=${DEVNAME#/dev/}
 QDB_KEY="/qubes-block-devices/$NAME"
-qubesdb-rm "$XS_KEY"
+# Trailing slash is intentional - it will remove whole directory, instead of
+# single base entry
+qubesdb-rm "$QDB_KEY/"
 qubesdb-write /qubes-block-devices ''
 
 # If device was connected to some VM - detach it