diff --git a/src/swtpm/common.c b/src/swtpm/common.c
index 2868dda8..e6b566ee 100644
--- a/src/swtpm/common.c
+++ b/src/swtpm/common.c
@@ -753,8 +753,7 @@ handle_tpmstate_options(const char *options)
             goto error;
         }
 
-        if (tpmstate_set_backend_uri(temp_uri) < 0 ||
-            tpmstate_set_mode(mode, mode_is_default) < 0) {
+        if (tpmstate_set_backend_uri(temp_uri) < 0) {
             ret = -1;
             goto error;
         }
@@ -763,14 +762,10 @@ handle_tpmstate_options(const char *options)
             ret = -1;
             goto error;
         }
-        if ((strncmp(tpmbackend_uri, "dir://", 6) == 0 ||
-            strncmp(tpmbackend_uri, "file://", 7)) &&
-            tpmstate_set_mode(mode, mode_is_default) < 0) {
-            ret = -1;
-            goto error;
-        }
     }
 
+    tpmstate_set_mode(mode, mode_is_default);
+
 error:
     free(tpmstatedir);
     free(tpmbackend_uri);
diff --git a/src/swtpm/tpmstate.c b/src/swtpm/tpmstate.c
index 852b5155..ebd8dd69 100644
--- a/src/swtpm/tpmstate.c
+++ b/src/swtpm/tpmstate.c
@@ -88,12 +88,10 @@ const char *tpmstate_get_backend_uri(void)
     return NULL;
 }
 
-int tpmstate_set_mode(mode_t mode, bool mode_is_default)
+void tpmstate_set_mode(mode_t mode, bool mode_is_default)
 {
     g_tpmstate_mode = mode;
     g_tpmstate_mode_is_default = mode_is_default;
-
-    return 0;
 }
 
 mode_t tpmstate_get_mode(bool *mode_is_default)
diff --git a/src/swtpm/tpmstate.h b/src/swtpm/tpmstate.h
index 3d36135f..e48694dd 100644
--- a/src/swtpm/tpmstate.h
+++ b/src/swtpm/tpmstate.h
@@ -45,7 +45,7 @@
 int tpmstate_set_backend_uri(char *backend_uri);
 const char *tpmstate_get_backend_uri(void);
 
-int tpmstate_set_mode(mode_t mode, bool mode_is_default);
+void tpmstate_set_mode(mode_t mode, bool mode_is_default);
 mode_t tpmstate_get_mode(bool *mode_is_default);
 void tpmstate_global_free(void);