diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementAutoConfiguration.java
index a024a3246..ef9b4b972 100644
--- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementAutoConfiguration.java
+++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementAutoConfiguration.java
@@ -9,7 +9,6 @@
  */
 package org.eclipse.hawkbit.autoconfigure.security;
 
-import org.eclipse.hawkbit.im.authentication.MultitenancyIndicator;
 import org.eclipse.hawkbit.im.authentication.StaticAuthenticationProvider;
 import org.eclipse.hawkbit.im.authentication.TenantAwareUserProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -46,13 +45,4 @@ public class InMemoryUserManagementAutoConfiguration extends GlobalAuthenticatio
     public void configure(final AuthenticationManagerBuilder auth) {
         auth.authenticationProvider(authenticationProvider);
     }
-
-    /**
-     * @return the multi-tenancy indicator to disallow multi-tenancy
-     */
-    @Bean
-    @ConditionalOnMissingBean
-    MultitenancyIndicator multiTenancyIndicator() {
-        return () -> false;
-    }
 }
\ No newline at end of file
diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/MultitenancyIndicator.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/MultitenancyIndicator.java
deleted file mode 100644
index b768822f3..000000000
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/MultitenancyIndicator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2015 Bosch Software Innovations GmbH and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.hawkbit.im.authentication;
-
-import org.springframework.security.authentication.AuthenticationProvider;
-
-/**
- * Indicates if the SP server runs in multi-tenancy mode. By means e.g. if a
- * login screen needs to allow to specifiy the tenant to login.
- *
- * This can defere e.g. in case if the {@link AuthenticationProvider} allows
- * {@link TenantUserPasswordAuthenticationToken} tokens or not.
- *
- *
- */
-@FunctionalInterface
-public interface MultitenancyIndicator {
-
-    /**
-     * @return {@code true} if multi-tenancy is supported, otherwise
-     *         {@code false}.
-     */
-    boolean isMultiTenancySupported();
-
-}