diff --git a/plugins/builder-dockerfile/core-post-extract b/plugins/builder-dockerfile/core-post-extract
index 16625f35f..c25d64b63 100755
--- a/plugins/builder-dockerfile/core-post-extract
+++ b/plugins/builder-dockerfile/core-post-extract
@@ -16,15 +16,16 @@ trigger-builder-dockerfile-core-post-extract() {
     return
   fi
 
-  if [[ ! -f "$NEW_DOCKERFILE" ]]; then
-    dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE"
-    rm -f Dockerfile
+  if [[ "$NEW_DOCKERFILE" == "Dockerfile" ]]; then
     return
   fi
 
-  if [[ "$NEW_DOCKERFILE" != "Dockerfile" ]]; then
-    mv "$NEW_DOCKERFILE" Dockerfile
+  if [[ ! -f "$NEW_DOCKERFILE" ]]; then
+    dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE"
+    return
   fi
+
+  mv "$NEW_DOCKERFILE" Dockerfile
   popd &>/dev/null
 }