diff --git a/jedi/evaluate/context/klass.py b/jedi/evaluate/context/klass.py
index 9c329d5d..acf68b67 100644
--- a/jedi/evaluate/context/klass.py
+++ b/jedi/evaluate/context/klass.py
@@ -233,14 +233,16 @@ class ClassContext(use_metaclass(CachedMetaClass, ClassMixin, FunctionAndClassBa
         if arglist:
             from jedi.evaluate import arguments
             args = arguments.TreeArguments(self.evaluator, self.parent_context, arglist)
-            return [value for key, value in args.unpack() if key is None]
-        else:
-            if self.py__name__() == 'object' \
-                    and self.parent_context == self.evaluator.builtins_module:
-                return []
-            return [LazyKnownContexts(
-                self.evaluator.builtins_module.py__getattribute__('object')
-            )]
+            lst = [value for key, value in args.unpack() if key is None]
+            if lst:
+                return lst
+
+        if self.py__name__() == 'object' \
+                and self.parent_context == self.evaluator.builtins_module:
+            return []
+        return [LazyKnownContexts(
+            self.evaluator.builtins_module.py__getattribute__('object')
+        )]
 
     def py__getitem__(self, index_context_set, contextualized_node):
         from jedi.evaluate.gradual.typing import LazyGenericClass
diff --git a/jedi/plugins/stdlib.py b/jedi/plugins/stdlib.py
index e578b5f5..b0203f87 100644
--- a/jedi/plugins/stdlib.py
+++ b/jedi/plugins/stdlib.py
@@ -243,9 +243,6 @@ def builtins_super(types, objects, context):
     if isinstance(context, FunctionExecutionContext):
         if isinstance(context.var_args, InstanceArguments):
             su = context.var_args.instance.py__class__().py__bases__()
-            # If super class cannot be infered
-            if len(su) == 0:
-                return NO_CONTEXTS
             return su[0].infer().execute_evaluated()
 
     return NO_CONTEXTS