diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RedetectFileTypeCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RedetectFileTypeCommand.java
index 8eeca0cb4cd..286b107a5fd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RedetectFileTypeCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RedetectFileTypeCommand.java
@@ -12,7 +12,8 @@
 import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
 import edu.harvard.iq.dataverse.util.EjbUtil;
-import edu.harvard.iq.dataverse.util.FileTypeDetection;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -62,7 +63,7 @@ public DataFile execute(CommandContext ctxt) throws CommandException {
             }
 
             logger.fine("target file: " + localFile);
-            String newlyDetectedContentType = FileTypeDetection.determineFileType(localFile);
+            String newlyDetectedContentType = FileUtil.determineFileType(localFile, fileToRedetect.getDisplayName());
             fileToRedetect.setContentType(newlyDetectedContentType);
         } catch (IOException ex) {
             throw new CommandException("Exception while attempting to get the bytes of the file during file type redetection: " + ex.getLocalizedMessage(), this);
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileTypeDetection.java b/src/main/java/edu/harvard/iq/dataverse/util/FileTypeDetection.java
deleted file mode 100644
index 52515c00524..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/util/FileTypeDetection.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.harvard.iq.dataverse.util;
-
-import java.io.File;
-import java.io.IOException;
-
-public class FileTypeDetection {
-
-    public static String determineFileType(File file) throws IOException {
-        return FileUtil.determineFileType(file, file.getName());
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
index 893c62b3cb0..4e97df82a8f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
@@ -546,6 +546,9 @@ public static String determineFileType(File f, String fileName) throws IOExcepti
              }
         } 
         
+        if(fileType==null) {
+            fileType = MIME_TYPE_UNDETERMINED_DEFAULT;
+        }
         logger.fine("returning fileType "+fileType);
         return fileType;
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/FileTypeDetectionTest.java b/src/test/java/edu/harvard/iq/dataverse/util/FileTypeDetectionTest.java
deleted file mode 100644
index 5d2b9b4d56a..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/util/FileTypeDetectionTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package edu.harvard.iq.dataverse.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.commons.io.FileUtils;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class FileTypeDetectionTest {
-
-    static String baseDirForConfigFiles = "/tmp";
-
-    @BeforeClass
-    public static void setUpClass() {
-        System.setProperty("com.sun.aas.instanceRoot", baseDirForConfigFiles);
-        String testFile1Src = "conf/jhove/jhove.conf";
-        String testFile1Tmp = baseDirForConfigFiles + "/config/jhove.conf";
-        try {
-            FileUtils.copyFile(new File(testFile1Src), new File(testFile1Tmp));
-        } catch (IOException ex) {
-            Logger.getLogger(JhoveFileTypeTest.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-        // SiteMapUtilTest relies on com.sun.aas.instanceRoot being null.
-        System.clearProperty("com.sun.aas.instanceRoot");
-    }
-
-    @Test
-    public void testDetermineFileTypeJupyterNoteboook() throws Exception {
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/util/irc-metrics.ipynb");
-        // https://jupyter.readthedocs.io/en/latest/reference/mimetype.html
-        assertEquals("application/x-ipynb+json", FileTypeDetection.determineFileType(file));
-    }
-
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/FileUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/FileUtilTest.java
index 226c677ed0f..7d638e8da62 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/FileUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/FileUtilTest.java
@@ -315,6 +315,18 @@ public void testDetermineFileTypeByExtension() {
                 fail("File does not exist: " + file.toPath().toString());
             }
         }
+        
+        @Test
+        public void testDetermineFileTypeFromName() {
+            //Verify that name of the local file isn't used in determining the type (as we often use *.tmp when the real name has a different extension)
+            try {
+                File file = File.createTempFile("empty", "png");
+                assertEquals("text/plain", FileUtil.determineFileType(file, "something.txt"));
+            } catch (IOException ex) {
+                Logger.getLogger(FileUtilTest.class.getName()).log(Level.SEVERE, null, ex);
+            }
+
+        }
 
         @Test
         public void testDetermineFileTypeByName() {