diff --git a/host/repush.sh b/host/repush.sh
index f1c2716..2fe5f7a 100755
--- a/host/repush.sh
+++ b/host/repush.sh
@@ -335,7 +335,7 @@ function push {
     directory=""
   fi
 
-  placeholder_basename="$(basename "$1")"
+  placeholder_basename="$(basename "$1" ".$extension")"
 
   # Since the WebUI doesn't accept directories, we're creating a PDF placeholder
   # fs entry, who's metadata we'll then alter to that of a directory fs entry
@@ -525,7 +525,7 @@ fi
 
 # Check if file with same name already exists in the root directory
 for f in "$@"; do
-  uuid_of_root_file "$(basename "$f")"
+  uuid_of_root_file "$(basename "$f" "${f##*.}")"
 
   if [ ! -z $RET_UUID ]; then
     echo "repush: Cannot push '$f': File already exists in root directory"